Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker: update Python and PHP versions #1497

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/docker/Dockerfile.php8.2 → pkg/docker/Dockerfile.php8.4
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ 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
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)))
Expand Down