use rc2 locally, but override server-builder dockerfile to fetch constraints.txt from rc1, add no-cache. Now build-images work locally.

Author: fredvd

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PYTHON_VERSION=3.12
-ARG PLONE_VERSION=6.1.0rc1
+ARG PLONE_VERSION=6.1.0rc2
 FROM plone/server-builder:${PLONE_VERSION} AS builder
 
 ARG PLONE_VERSION
@@ -12,7 +12,7 @@ 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" \
+      org.label-schema.description="Plone $PLONE-VERSION backend image using Python $PYTHON_VERSION" \
       org.label-schema.vendor="Plone Foundation"
 
 # Use /app as the workdir

Dockerfile.acceptance

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PYTHON_VERSION=3.12
-ARG PLONE_VERSION=6.1.0rc1
+ARG PLONE_VERSION=6.1.0rc2
 FROM plone/server-builder:${PLONE_VERSION} AS builder
 
 ARG PLONE_VERSION

Dockerfile.builder

@@ -2,7 +2,7 @@
 ARG PYTHON_VERSION=3.12
 FROM python:${PYTHON_VERSION}-slim-bookworm
 
-ARG PLONE_VERSION=6.1.0rc1
+ARG PLONE_VERSION=6.1.0rc2
 
 ENV EXTRA_PACKAGES="relstorage==4.1.1 psycopg2==2.9.10 python-ldap==3.4.4 ZEO"
 
@@ -32,7 +32,7 @@ RUN <<EOT
     apt-get install -y --no-install-recommends $buildDeps
     busybox --install -s
     python -m venv /app
-    curl -L -o /app/constraints.txt https://dist.plone.org/release/$PLONE_VERSION/constraints.txt
+    curl -L -o /app/constraints.txt https://dist.plone.org/release/6.1.0rc1/constraints.txt
     /app/bin/pip install -U pip wheel setuptools -c /app/constraints.txt
     /app/bin/pip install Plone ${EXTRA_PACKAGES} -c /app/constraints.txt
     bash -c 'mkdir -p /data/{filestorage,blobstorage,cache,logs}'

Dockerfile.classicui

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PYTHON_VERSION=3.12
-ARG PLONE_VERSION=6.1.0rc1
+ARG PLONE_VERSION=6.1.0rc2
 FROM plone/server-builder:${PLONE_VERSION} AS builder
 
 ARG PLONE_VERSION

Dockerfile.dev

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PYTHON_VERSION=3.12
-ARG PLONE_VERSION=6.1.0rc1
+ARG PLONE_VERSION=6.1.0rc2
 FROM plone/server-builder:${PLONE_VERSION}
 
 ARG PYTHON_VERSION

Dockerfile.prod

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PYTHON_VERSION=3.12
-ARG PLONE_VERSION=6.1.0rc1
+ARG PLONE_VERSION=6.1.0rc2
 FROM python:${PYTHON_VERSION}-slim-bookworm
 
 ARG PYTHON_VERSION

Makefile

@@ -69,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} --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t $(BASE_IMAGE_NAME)-builder:$(IMAGE_TAG) -f Dockerfile.builder --load
+	@docker buildx build . --no-cache --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} --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t $(BASE_IMAGE_NAME)-dev:$(IMAGE_TAG) -f Dockerfile.dev --load
+	@docker buildx build . --no-cache --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} --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t $(BASE_IMAGE_NAME)-prod-config:$(IMAGE_TAG) -f Dockerfile.prod --load
+	@docker buildx build . --no-cache --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} --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t $(CLASSICUI_IMAGE_NAME):$(IMAGE_TAG) -f Dockerfile.classicui --load
+	@docker buildx build . --no-cache --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} --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t $(BASE_IMAGE_NAME)-acceptance:$(IMAGE_TAG) -f Dockerfile.acceptance --load
+	@docker buildx build . --no-cache --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} --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t $(MAIN_IMAGE_NAME):$(IMAGE_TAG) -f Dockerfile --load
+	@docker buildx build . --no-cache --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 buildx build . --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t $(MAIN_IMAGE_NAME):$(NIGHTLY_IMAGE_TAG) -f Dockerfile.nightly --load
+	@docker buildx build . --no-cache --build-arg PYTHON_VERSION=${PYTHON_VERSION} -t $(MAIN_IMAGE_NAME):$(NIGHTLY_IMAGE_TAG) -f Dockerfile.nightly --load
 
 .PHONY: build-images
 build-images:  ## Build Images

README.md

@@ -28,7 +28,7 @@ These images are **not** Buildout based!
 | Plone Version | Tags | Dockerfile |
 | --- | --- | --- |
 | 6 | `6.0.13`, `6.0`, `6`, `latest` | [(6.0.x/Dockerfile)](https://github.com/plone/plone-backend/blob/v6.0.13/Dockerfile)|
-| 6.1 | `6.1.0rc1`, `6.1` | [(6.1.x/Dockerfile)](https://github.com/plone/plone-backend/blob/v6.1.0rc1/Dockerfile)|
+| 6.1 | `6.1.0rc2`, `6.1` | [(6.1.x/Dockerfile)](https://github.com/plone/plone-backend/blob/v6.1.0rc2/Dockerfile)|
 | 6 (nightly) | `nightly` |  [(Dockerfile.nightly)](https://github.com/plone/plone-backend/blob/6.0.x/Dockerfile.nightly) |
 
 ### Unsupported tags

version.txt

@@ -1 +1 @@
-6.1.0rc1
+6.1.0rc2