diff options
| author | Konstantin Pavlov <thresh@nginx.com> | 2024-11-26 14:34:07 -0800 |
|---|---|---|
| committer | Konstantin Pavlov <pavlov.konstantin@gmail.com> | 2024-12-12 17:32:07 -0800 |
| commit | 9e98a7e5fcbcd4a2bba34c4ff8c1bbac6ffd1ec7 (patch) | |
| tree | a6e87893c379ff0837ab22458380433d5f46b4d0 | |
| parent | f189d39359cfb9e205d2c5827d67685123b1754d (diff) | |
| download | unit-9e98a7e5fcbcd4a2bba34c4ff8c1bbac6ffd1ec7.tar.gz unit-9e98a7e5fcbcd4a2bba34c4ff8c1bbac6ffd1ec7.tar.bz2 | |
Docker: update Python and PHP versions
| -rw-r--r-- | pkg/docker/Dockerfile.php8.4 (renamed from pkg/docker/Dockerfile.php8.2) | 4 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.python3.13 (renamed from pkg/docker/Dockerfile.python3.11) | 4 | ||||
| -rw-r--r-- | pkg/docker/Dockerfile.python3.13-slim (renamed from pkg/docker/Dockerfile.python3.11-slim) | 4 | ||||
| -rw-r--r-- | pkg/docker/Makefile | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkg/docker/Dockerfile.php8.2 b/pkg/docker/Dockerfile.php8.4 index 354acf94..69cdffe7 100644 --- a/pkg/docker/Dockerfile.php8.2 +++ b/pkg/docker/Dockerfile.php8.4 @@ -1,6 +1,6 @@ -FROM php:8.2-cli-bookworm +FROM php:8.4-cli-bookworm -LABEL org.opencontainers.image.title="Unit (php8.2)" +LABEL org.opencontainers.image.title="Unit (php8.4)" LABEL org.opencontainers.image.description="Official build of Unit for Docker." LABEL org.opencontainers.image.url="https://unit.nginx.org" LABEL org.opencontainers.image.source="https://github.com/nginx/unit" diff --git a/pkg/docker/Dockerfile.python3.11 b/pkg/docker/Dockerfile.python3.13 index a0a06a48..f8de3151 100644 --- a/pkg/docker/Dockerfile.python3.11 +++ b/pkg/docker/Dockerfile.python3.13 @@ -1,6 +1,6 @@ -FROM python:3.11-bookworm +FROM python:3.13-bookworm -LABEL org.opencontainers.image.title="Unit (python3.11)" +LABEL org.opencontainers.image.title="Unit (python3.13)" LABEL org.opencontainers.image.description="Official build of Unit for Docker." LABEL org.opencontainers.image.url="https://unit.nginx.org" LABEL org.opencontainers.image.source="https://github.com/nginx/unit" diff --git a/pkg/docker/Dockerfile.python3.11-slim b/pkg/docker/Dockerfile.python3.13-slim index bb9b32a8..0b2d3dc7 100644 --- a/pkg/docker/Dockerfile.python3.11-slim +++ b/pkg/docker/Dockerfile.python3.13-slim @@ -1,6 +1,6 @@ -FROM python:3.11-slim-bookworm +FROM python:3.13-slim-bookworm -LABEL org.opencontainers.image.title="Unit (python3.11-slim)" +LABEL org.opencontainers.image.title="Unit (python3.13-slim)" LABEL org.opencontainers.image.description="Official build of Unit for Docker." LABEL org.opencontainers.image.url="https://unit.nginx.org" LABEL org.opencontainers.image.source="https://github.com/nginx/unit" diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 9dbca2d2..d633f870 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -52,7 +52,7 @@ INSTALL_perl ?= perl-install RUN_perl ?= /bin/true MODULE_PREBUILD_perl ?= /bin/true -VERSIONS_php ?= 8.2 8.3 +VERSIONS_php ?= 8.3 8.4 VARIANT_php ?= cli-$(VARIANT) $(foreach phpversion, $(VERSIONS_php), $(eval CONTAINER_php$(phpversion) = php:$(phpversion)-$(VARIANT_php))) CONFIGURE_php ?= php @@ -60,7 +60,7 @@ INSTALL_php ?= php-install RUN_php ?= ldconfig MODULE_PREBUILD_php ?= /bin/true -VERSIONS_python ?= 3.11 3.12 +VERSIONS_python ?= 3.12 3.13 VARIANT_python ?= $(VARIANT) $(foreach pythonversion, $(VERSIONS_python), $(eval CONTAINER_python$(pythonversion) = python:$(pythonversion)-$(VARIANT_python))) $(foreach pythonversion, $(VERSIONS_python), $(eval CONTAINER_python$(pythonversion)-slim = python:$(pythonversion)-slim-$(VARIANT_python))) |