Skip to content

Commit

Permalink
Pin plone.distribution to 1.0.0b4 for now to get backend distribution…
Browse files Browse the repository at this point in the history
… 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.
  • Loading branch information
fredvd committed May 16, 2024
1 parent 43acb75 commit c4daf8c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
7 changes: 5 additions & 2 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>" \
Expand All @@ -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
Expand All @@ -27,3 +27,6 @@ RUN <<EOT
ADDITIONAL_PROFILES=plone6demo:initial
./docker-entrypoint.sh create-site
EOT

ENTRYPOINT [ "/app/docker-entrypoint.sh" ]
CMD ["start"]
6 changes: 5 additions & 1 deletion backend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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))))

Expand Down Expand Up @@ -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)
1 change: 1 addition & 0 deletions backend/constraints.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
-c https://dist.plone.org/release/6.0.11/constraints.txt
plone.distribution==1.0.0b4

0 comments on commit c4daf8c

Please sign in to comment.