Use bookworm-slim, python3.12

Fix buildx warning for ARG and ENV usage.
update relstorage, python-ldap, add sasl2 for ldap installation.
Fix libtiff5 to 6
Update and pin pip and wheel
Remove importlibmetadata env var for older pip issue.
Fix FROM/as casing warning from buildx.

Author: fredvd

Dockerfile

@@ -1,9 +1,15 @@
 # syntax=docker/dockerfile:1
-ARG PYTHON_VERSION=3.11
+ARG PYTHON_VERSION=3.12
+ARG PLONE_VERSION=6.1.0rc1
+FROM plone/server-builder:${PLONE_VERSION} AS builder
+
 ARG PLONE_VERSION
-FROM plone/server-builder:${PLONE_VERSION} as builder
+
 FROM plone/server-prod-config:${PLONE_VERSION}
 
+ARG PYTHON_VERSION
+ARG PLONE_VERSION
+
 LABEL maintainer="Plone Community <[email protected]>" \
       org.label-schema.name="plone-backend" \
       org.label-schema.description="Plone backend image using Python $PYTHON_VERSION" \

Dockerfile.acceptance

@@ -1,16 +1,18 @@
 # syntax=docker/dockerfile:1
-ARG PYTHON_VERSION=3.11
-ARG PLONE_VERSION
-FROM plone/server-builder:${PLONE_VERSION} as builder
+ARG PYTHON_VERSION=3.12
+ARG PLONE_VERSION=6.1.0rc1
+FROM plone/server-builder:${PLONE_VERSION} AS builder
 
-# https://github.com/pypa/pip/issues/12079
-ENV _PIP_USE_IMPORTLIB_METADATA=0
+ARG PLONE_VERSION
 
 # Install robotframework support
 RUN /app/bin/pip install plone.app.robotframework>=2.0.0
 
 FROM plone/server-prod-config:${PLONE_VERSION}
 
+ARG PYTHON_VERSION
+ARG PLONE_VERSION
+
 LABEL maintainer="Plone Community <[email protected]>" \
       org.label-schema.name="server-acceptance" \
       org.label-schema.description="Plone $PLONE_VERSION backend acceptance image using Python $PYTHON_VERSION" \
@@ -21,7 +23,7 @@ LABEL maintainer="Plone Community <[email protected]>" \
 COPY --from=builder --chown=500:500 /app /app
 
 # Set chameleon cache directory
-ENV CHAMELEON_CACHE /app/var/cache
+ENV CHAMELEON_CACHE=/app/var/cache
 # Zope listens to all ip addresses
 ENV ZSERVER_HOST=0.0.0.0
 # Zope port to be 55001

Dockerfile.builder

@@ -1,10 +1,10 @@
 # syntax=docker/dockerfile:1
-ARG PYTHON_VERSION=3.11
-FROM python:${PYTHON_VERSION}-slim-bullseye
+ARG PYTHON_VERSION=3.12
+FROM python:${PYTHON_VERSION}-slim-bookworm
 
-ARG PLONE_VERSION
+ARG PLONE_VERSION=6.1.0rc1
 
-ENV EXTRA_PACKAGES="relstorage==3.5.0 psycopg2==2.9.5 python-ldap==3.4.3 ZEO"
+ENV EXTRA_PACKAGES="relstorage==4.1.1 psycopg2==2.9.10 python-ldap==3.4.4 ZEO"
 
 
 LABEL maintainer="Plone Community <[email protected]>" \
@@ -28,7 +28,7 @@ RUN <<EOT
     set -e
     apt-get update
     apt-get -y upgrade
-    buildDeps="build-essential busybox ca-certificates curl git gosu libbz2-dev libffi-dev libjpeg62-turbo-dev libmagic1 libldap2-dev libopenjp2-7-dev libpcre3-dev libpq-dev libsasl2-dev libssl-dev libtiff5-dev libxml2-dev libxslt1-dev wget zlib1g-dev"
+    buildDeps="build-essential busybox ca-certificates curl git gosu libbz2-dev libffi-dev libjpeg62-turbo-dev libmagic1 libsasl2-dev libldap2-dev libopenjp2-7-dev libpcre3-dev libpq-dev libsasl2-dev libssl-dev libtiff6 libtiff5-dev libxml2-dev libxslt1-dev wget zlib1g-dev"
     apt-get install -y --no-install-recommends $buildDeps
     busybox --install -s
     python -m venv /app

Dockerfile.classicui

@@ -1,13 +1,18 @@
 # syntax=docker/dockerfile:1
-ARG PYTHON_VERSION=3.11
+ARG PYTHON_VERSION=3.12
+ARG PLONE_VERSION=6.1.0rc1
+FROM plone/server-builder:${PLONE_VERSION} AS builder
+
 ARG PLONE_VERSION
-FROM plone/server-builder:${PLONE_VERSION} as builder
 
-# Remove Volto support from builder image
+# Remove Volto support from builder image, this is Classic-UI
 RUN /app/bin/pip uninstall -y plone.volto
 
 FROM plone/server-prod-config:${PLONE_VERSION}
 
+ARG PYTHON_VERSION
+ARG PLONE_VERSION
+
 LABEL maintainer="Plone Community <[email protected]>" \
       org.label-schema.name="plone-classicui" \
       org.label-schema.description="Plone $PLONE_VERSION Classic UI image using Python $PYTHON_VERSION" \

Dockerfile.dev

@@ -1,8 +1,10 @@
 # syntax=docker/dockerfile:1
-ARG PYTHON_VERSION=3.11
-ARG PLONE_VERSION
+ARG PYTHON_VERSION=3.12
+ARG PLONE_VERSION=6.1.0rc1
 FROM plone/server-builder:${PLONE_VERSION}
 
+ARG PYTHON_VERSION
+ARG PLONE_VERSION
 
 LABEL maintainer="Plone Community <[email protected]>" \
       org.label-schema.name="server-dev" \
@@ -19,15 +21,15 @@ RUN <<EOT
 EOT
 
 # Turns off buffering
-ENV PYTHONUNBUFFERED 1
+ENV PYTHONUNBUFFERED=1
 # Keeps Python from generating .pyc files
-ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONDONTWRITEBYTECODE=1
 # Enable Application server in debug mode
-ENV DEBUG_MODE on
+ENV DEBUG_MODE=on
 # Disable compilation of po files into mo files
 ENV zope_i18n_compile_mo_files=
 # Set chameleon cache directory
-ENV CHAMELEON_CACHE /app/var/cache
+ENV CHAMELEON_CACHE=/app/var/cache
 # Expose Zope Port
 EXPOSE 8080
 

Dockerfile.nightly

@@ -1,25 +1,25 @@
 # syntax=docker/dockerfile:1
-ARG PYTHON_VERSION=3.11
-FROM python:${PYTHON_VERSION}-slim-bullseye as base
-FROM base as builder
+ARG PYTHON_VERSION=3.12
+FROM python:${PYTHON_VERSION}-slim-bookworm AS base
+FROM base AS builder
 
 ENV PIP_PARAMS=""
-ENV PIP_VERSION=22.3.1
-ENV EXTRA_PACKAGES="relstorage==3.5.0 psycopg2==2.9.5 python-ldap==3.4.3"
+ENV PIP_VERSION=24.3.1
+ENV EXTRA_PACKAGES="relstorage==4.1.1 psycopg2==2.9.10 python-ldap==3.4.4"
 
 RUN mkdir /wheelhouse
 
 RUN <<EOT
     set -e
     apt-get update
-    buildDeps="build-essential curl libbz2-dev libffi-dev libjpeg62-turbo-dev libldap2-dev libopenjp2-7-dev libpcre3-dev libpq-dev libsasl2-dev libssl-dev libtiff5-dev libxml2-dev libxslt1-dev wget unzip zlib1g-dev"
+    buildDeps="build-essential curl libbz2-dev libffi-dev libjpeg62-turbo-dev libsasl2-dev libldap2-dev libopenjp2-7-dev libpcre3-dev libpq-dev libsasl2-dev libssl-dev libtiff6 libtiff5-dev libxml2-dev libxslt1-dev wget unzip zlib1g-dev"
     apt-get install -y --no-install-recommends $buildDeps
     pip install -U "pip==${PIP_VERSION}"
-    pip install -U "zc.buildout>=3.0.0rc1" "wheel"
+    pip install -U "zc.buildout==4.0" "wheel==0.45.1"
     rm -rf /var/lib/apt/lists/* /usr/share/doc
-    curl -L -o workspace.zip https://github.com/plone/buildout.coredev/archive/refs/heads/6.0.zip
+    curl -L -o workspace.zip https://github.com/plone/buildout.coredev/archive/refs/heads/6.1.zip
     unzip workspace.zip
-    mv buildout.coredev-6.0 /workspace
+    mv buildout.coredev-6.1 /workspace
 EOT
 
 WORKDIR /workspace
@@ -36,7 +36,7 @@ EOT
 FROM base
 
 ENV PIP_PARAMS=""
-ENV PIP_VERSION=22.0.4
+ENV PIP_VERSION=24.3.1
 
 LABEL maintainer="Plone Community <[email protected]>" \
       org.label-schema.name="plone-backend" \
@@ -48,7 +48,7 @@ COPY --from=builder /wheelhouse /wheelhouse
 RUN <<EOT
     set -e
     useradd --system -m -d /app -U -u 500 plone
-    runDeps="git libjpeg62 libopenjp2-7 libpq5 libtiff5 libxml2 libxslt1.1 lynx netcat poppler-utils rsync wv busybox libmagic1 gosu make"
+    runDeps="git libjpeg62 libopenjp2-7 libpq5 libtiff6 libxml2 libxslt1.1 lynx netcat-openbsd poppler-utils rsync wv busybox libmagic1 gosu make"
     apt-get update
     apt-get install -y --no-install-recommends $runDeps
     busybox --install -s

Dockerfile.prod

@@ -1,6 +1,10 @@
 # syntax=docker/dockerfile:1
-ARG PYTHON_VERSION=3.11
-FROM python:${PYTHON_VERSION}-slim-bullseye
+ARG PYTHON_VERSION=3.12
+ARG PLONE_VERSION=6.1.0rc1
+FROM python:${PYTHON_VERSION}-slim-bookworm
+
+ARG PYTHON_VERSION
+ARG PLONE_VERSION
 
 LABEL maintainer="Plone Community <[email protected]>" \
       org.label-schema.name="server-prod-conf" \
@@ -11,7 +15,7 @@ LABEL maintainer="Plone Community <[email protected]>" \
 RUN <<EOT
     set -e
     useradd --system -m -d /app -U -u 500 plone
-    runDeps="ca-certificates git libjpeg62 libopenjp2-7 libpq5 libtiff5 libxml2 libxslt1.1 lynx netcat poppler-utils rsync wv busybox gosu libmagic1 make"
+    runDeps="ca-certificates git libjpeg62 libopenjp2-7 libpq5 libtiff6 libxml2 libxslt1.1 lynx netcat-openbsd poppler-utils rsync wv busybox gosu libmagic1 make"
     apt-get update
     apt-get -y upgrade
     apt-get install -y --no-install-recommends $runDeps
@@ -23,9 +27,9 @@ RUN <<EOT
 EOT
 
 # Disable debug mode
-ENV DEBUG_MODE off
+ENV DEBUG_MODE=off
 # Set chameleon cache directory
-ENV CHAMELEON_CACHE /app/var/cache
+ENV CHAMELEON_CACHE=/app/var/cache
 # Disable compilation of po files into mo files (This should be done in the builder image)
 ENV zope_i18n_compile_mo_files=
 

Makefile

@@ -22,12 +22,13 @@ MAIN_IMAGE_NAME=plone/plone-backend
 CLASSICUI_IMAGE_NAME=plone/plone-classicui
 BASE_IMAGE_NAME=plone/server
 PLONE_VERSION=$$(cat version.txt)
+PYTHON_VERSION=3.12
 IMAGE_TAG=${PLONE_VERSION}
 NIGHTLY_IMAGE_TAG=nightly
 
 # Code Quality
 CURRENT_FOLDER=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-CODE_QUALITY_VERSION=2.1.0
+CODE_QUALITY_VERSION=2.1.1
 ifndef LOG_LEVEL
 	LOG_LEVEL=INFO
 endif
@@ -68,37 +69,37 @@ show-image: ## Print Version
 .PHONY: image-builder
 image-builder:  ## Build Base Image
 	@echo "Building $(BASE_IMAGE_NAME)-builder:$(IMAGE_TAG)"
-	@docker buildx build . --build-arg PLONE_VERSION=${PLONE_VERSION} -t $(BASE_IMAGE_NAME)-builder:$(IMAGE_TAG) -f Dockerfile.builder --load
+	@docker buildx build . --build-arg PLONE_VERSION=${PLONE_VERSION} --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t $(BASE_IMAGE_NAME)-builder:$(IMAGE_TAG) -f Dockerfile.builder --load
 
 .PHONY: image-dev
 image-dev:  ## Build Dev Image
 	@echo "Building $(BASE_IMAGE_NAME)-dev:$(IMAGE_TAG)"
-	@docker buildx build . --build-arg PLONE_VERSION=${PLONE_VERSION} -t $(BASE_IMAGE_NAME)-dev:$(IMAGE_TAG) -f Dockerfile.dev --load
+	@docker buildx build . --build-arg PLONE_VERSION=${PLONE_VERSION} --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t $(BASE_IMAGE_NAME)-dev:$(IMAGE_TAG) -f Dockerfile.dev --load
 
 .PHONY: image-prod-config
 image-prod-config:  ## Build Prod Image
 	@echo "Building $(BASE_IMAGE_NAME)-prod-config:$(IMAGE_TAG)"
-	@docker buildx build . --build-arg PLONE_VERSION=${PLONE_VERSION} -t $(BASE_IMAGE_NAME)-prod-config:$(IMAGE_TAG) -f Dockerfile.prod --load
+	@docker buildx build . --build-arg PLONE_VERSION=${PLONE_VERSION} --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t $(BASE_IMAGE_NAME)-prod-config:$(IMAGE_TAG) -f Dockerfile.prod --load
 
 .PHONY: image-classicui
 image-classicui:  ## Build Classic UI
 	@echo "Building $(CLASSICUI_IMAGE_NAME):$(IMAGE_TAG)"
-	@docker buildx build . --build-arg PLONE_VERSION=${PLONE_VERSION} -t $(CLASSICUI_IMAGE_NAME):$(IMAGE_TAG) -f Dockerfile.classicui --load
+	@docker buildx build . --build-arg PLONE_VERSION=${PLONE_VERSION} --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t $(CLASSICUI_IMAGE_NAME):$(IMAGE_TAG) -f Dockerfile.classicui --load
 
 .PHONY: image-acceptance
 image-acceptance:  ## Build Acceptance Image
 	@echo "Building $(BASE_IMAGE_NAME)-acceptance:$(IMAGE_TAG)"
-	@docker buildx build . --build-arg PLONE_VERSION=${PLONE_VERSION} -t $(BASE_IMAGE_NAME)-acceptance:$(IMAGE_TAG) -f Dockerfile.acceptance --load
+	@docker buildx build . --build-arg PLONE_VERSION=${PLONE_VERSION} --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t $(BASE_IMAGE_NAME)-acceptance:$(IMAGE_TAG) -f Dockerfile.acceptance --load
 
 .PHONY: image-main
 image-main:  ## Build main image
 	@echo "Building $(MAIN_IMAGE_NAME):$(IMAGE_TAG)"
-	@docker buildx build . --build-arg PLONE_VERSION=${PLONE_VERSION} -t $(MAIN_IMAGE_NAME):$(IMAGE_TAG) -f Dockerfile --load
+	@docker buildx build . --build-arg PLONE_VERSION=${PLONE_VERSION} --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t $(MAIN_IMAGE_NAME):$(IMAGE_TAG) -f Dockerfile --load
 
 .PHONY: image-nightly
 image-nightly:  ## Build Docker Image Nightly
 	@echo "Building $(MAIN_IMAGE_NAME):$(NIGHTLY_IMAGE_TAG)"
-	@docker build . -t $(MAIN_IMAGE_NAME):$(NIGHTLY_IMAGE_TAG) -f Dockerfile.nightly
+	@docker buildx build . --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t $(MAIN_IMAGE_NAME):$(NIGHTLY_IMAGE_TAG) -f Dockerfile.nightly --load
 
 .PHONY: build-images
 build-images:  ## Build Images