Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
JeffersonBledsoe committed Jan 9, 2024
1 parent 7621f77 commit 435ffa3
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 2 deletions.
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,13 @@ pull-backend-image: ## Pulls and updates the backend image (for use it while de
.PHONY: release
release: ## Release a version of the add-on
yarn release


.PHONY: temp-build
temp-build: ## Stop acceptance server (for use it while finished developing)
${ACCEPTANCE} --profile dev build --no-cache backend-acceptance

.PHONY: temp
# ${ACCEPTANCE} --profile dev up --no-recreate backend-acceptance
temp: ## Stop acceptance server (for use it while finished developing)
${ACCEPTANCE} up --no-recreate --no-attach backend-acceptance
17 changes: 15 additions & 2 deletions acceptance/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
ADDON_PATH: "${ADDON_PATH}"
VOLTO_VERSION: ${VOLTO_VERSION}
volumes:
- ${CURRENT_DIR}:/app/src/addons/${ADDON_PATH}/
- .:/app/src/addons/${ADDON_PATH}/
environment:
RAZZLE_INTERNAL_API_PATH: http://backend-acceptance:55001/plone
RAZZLE_API_PATH: http://localhost:55001/plone
Expand Down Expand Up @@ -45,9 +45,22 @@ services:
- prod

backend-acceptance:
image: plone/server-acceptance:${PLONE_VERSION:-6}
build:
context: ../
dockerfile: ./dockerfiles/Dockerfile.acceptance-backend
environment:
ZSERVER_HOST: "0.0.0.0"
ZSERVER_PORT: "55001"
LISTEN_PORT: "55001"
SITE: plone
# APPLY_PROFILES: "plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default-homepage,collective.volto.formsupport:default"
PROFILES: "plone.volto:default-homepage,collective.volto.formsupport:default"
APPLY_PROFILES: "plone.volto:default-homepage,collective.volto.formsupport:default"
# CONFIGURE_PACKAGES: "plone.app.contenttypes,plone.restapi,plone.volto,collective.volto.formsupport"
ADDONS: "plone.app.robotframework plone.volto collective.volto.formsupport"
ports:
- 55001:55001
- 8080:8080
profiles:
- dev
- prod
16 changes: 16 additions & 0 deletions dockerfiles/Dockerfile.acceptance-backend
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# syntax=docker/dockerfile:1
ARG PLONE_VERSION
# FROM plone/server-acceptance:${PLONE_VERSION:-6}
FROM plone/plone-backend:${PLONE_VERSION:-6}

# ENTRYPOINT [ "/app/docker-entrypoint.sh" ]
# ENTRYPOINT ["/bin/sh", "-c" , "/app/docker-entrypoint.sh && /app/bin/robot-server plone.app.robotframework.testing.PLONE_ROBOT_TESTING"]
# CMD ["/bin/bash", "-c" , "/app/docker-entrypoint.sh create-volto && /app/bin/robot-server plone.app.robotframework.testing.PLONE_ROBOT_TESTING"]
# CMD ["/bin/bash", "-c" , "/app/bin/robot-server plone.app.robotframework.testing.PLONE_ROBOT_TESTING"]
CMD ["/bin/bash"]
# CMD ["/app/bin/robot-server", "plone.app.robotframework.testing.PLONE_ROBOT_TESTING"]


# ARG EXTRA_PACKAGES
# RUN /app/bin/pip install ${EXTRA_PACKAGES}
# TODO: Contribute extra-packages support to core image
1 change: 1 addition & 0 deletions dockerfiles/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ services:
environment:
SITE: Plone
CORS_: true
ADDONS: "collective.volto.formsupport"
ports:
- 8080:8080
profiles:
Expand Down

0 comments on commit 435ffa3

Please sign in to comment.