From c4daf8c5fd5aa6f31df28f7b1af05df72fe98a3c Mon Sep 17 00:00:00 2001
From: Fred van Dijk <fredvd@gmail.com>
Date: Thu, 16 May 2024 22:43:54 +0200
Subject: [PATCH] Pin plone.distribution to 1.0.0b4 for now to get backend
 distribution back up and running Repeat ENTRYPOINT and CMD to see if it fixes
 the sigint signal add build-image-nocache option by naming the from input and
 filtering it.

---
 backend/Dockerfile      | 7 +++++--
 backend/Makefile        | 6 +++++-
 backend/constraints.txt | 1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index c3af23d..72a6fcf 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 ARG SEED=1000
 ARG PLONE_VERSION=6.0.11
-FROM plone/plone-backend:${PLONE_VERSION}
+FROM plone/plone-backend:${PLONE_VERSION} AS plonebackend
 
 
 LABEL maintainer="Plone Foundation <collective@plone.org>" \
@@ -14,7 +14,7 @@ COPY . .
 
 # Install local requirements and fix permissions
 RUN <<EOT
-    ./bin/pip install mxdev
+    ./bin/pip install mxdev==4.0.2
     mv requirements-docker.txt requirements.txt
     ./bin/mxdev -c mx.ini
     ./bin/pip install -r requirements-mxdev.txt
@@ -27,3 +27,6 @@ RUN <<EOT
     ADDITIONAL_PROFILES=plone6demo:initial
     ./docker-entrypoint.sh create-site
 EOT
+
+ENTRYPOINT [ "/app/docker-entrypoint.sh" ]
+CMD ["start"]
\ No newline at end of file
diff --git a/backend/Makefile b/backend/Makefile
index 7df86fd..6267427 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -19,7 +19,7 @@ YELLOW=`tput setaf 3`
 DISTRIBUTIONS="voltodemo"
 ALLOWED_DISTRIBUTIONS="voltodemo"
 
-PLONE_VERSION=6.0.11
+PLONE_VERSION=6.0.11.1
 
 BACKEND_FOLDER=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 
@@ -173,3 +173,7 @@ debug: instance/etc/zope.ini ## Run debug console
 .PHONY: build-image
 build-image:  ## Build Docker Image
 	@docker build . -t $(IMAGE_NAME):$(IMAGE_TAG) -f Dockerfile --build-arg PLONE_VERSION=$(PLONE_VERSION)
+
+.PHONY: build-image-nocache
+build-image-nocache:  ## Build Docker Image
+	@docker buildx build . -t $(IMAGE_NAME):$(IMAGE_TAG) --no-cache-filter plonebackend -f Dockerfile --build-arg PLONE_VERSION=$(PLONE_VERSION)
diff --git a/backend/constraints.txt b/backend/constraints.txt
index d32a83f..ed53462 100644
--- a/backend/constraints.txt
+++ b/backend/constraints.txt
@@ -1 +1,2 @@
 -c https://dist.plone.org/release/6.0.11/constraints.txt
+plone.distribution==1.0.0b4
\ No newline at end of file