From 303d6a26962b3b11dcf9ac56e03dba01ad2e957f Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Tue, 26 Nov 2024 14:34:07 -0800 Subject: [PATCH] Docker: update Python and PHP versions --- pkg/docker/{Dockerfile.php8.2 => Dockerfile.php8.4} | 4 ++-- pkg/docker/{Dockerfile.python3.11 => Dockerfile.python3.13} | 4 ++-- ...{Dockerfile.python3.11-slim => Dockerfile.python3.13-slim} | 4 ++-- pkg/docker/Makefile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename pkg/docker/{Dockerfile.php8.2 => Dockerfile.php8.4} (98%) rename pkg/docker/{Dockerfile.python3.11 => Dockerfile.python3.13} (98%) rename pkg/docker/{Dockerfile.python3.11-slim => Dockerfile.python3.13-slim} (97%) diff --git a/pkg/docker/Dockerfile.php8.2 b/pkg/docker/Dockerfile.php8.4 similarity index 98% rename from pkg/docker/Dockerfile.php8.2 rename to pkg/docker/Dockerfile.php8.4 index 354acf94c..69cdffe76 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 similarity index 98% rename from pkg/docker/Dockerfile.python3.11 rename to pkg/docker/Dockerfile.python3.13 index a0a06a489..f8de3151b 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 similarity index 97% rename from pkg/docker/Dockerfile.python3.11-slim rename to pkg/docker/Dockerfile.python3.13-slim index bb9b32a82..0b2d3dc79 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 9dbca2d2f..d633f8707 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)))