From be90a320e61afc09a139c6dbd362156ba1ebaa31 Mon Sep 17 00:00:00 2001 From: "me@jeffersonbledsoe.com" Date: Thu, 11 Jan 2024 10:39:30 +0000 Subject: [PATCH] Maybe working robot server? --- Makefile | 10 +++++----- acceptance/docker-compose.yml | 14 +++++--------- dockerfiles/Dockerfile.acceptance-backend | 7 +++++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 5fa142f..9c25d02 100644 --- a/Makefile +++ b/Makefile @@ -151,11 +151,11 @@ 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-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 +.PHONY: temp temp: ## Stop acceptance server (for use it while finished developing) - ${ACCEPTANCE} up --no-recreate --no-attach backend-acceptance + ${ACCEPTANCE} up --no-cache backend-acceptance diff --git a/acceptance/docker-compose.yml b/acceptance/docker-compose.yml index 33854e1..1d9de7c 100644 --- a/acceptance/docker-compose.yml +++ b/acceptance/docker-compose.yml @@ -45,19 +45,15 @@ services: - prod backend-acceptance: - build: - context: ../ - dockerfile: ./dockerfiles/Dockerfile.acceptance-backend + image: plone/plone-backend:6.0.7 + command: ["/app/bin/robot-server", "plone.app.robotframework.testing.PLONE_ROBOT_TESTING"] 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" + CONFIGURE_PACKAGES: "plone.restapi,plone.volto" + APPLY_PROFILES: "plone.volto:default-homepage" + ADDONS: "plone.app.robotframework plone.volto" ports: - 55001:55001 - 8080:8080 diff --git a/dockerfiles/Dockerfile.acceptance-backend b/dockerfiles/Dockerfile.acceptance-backend index b02446a..3cdd65d 100644 --- a/dockerfiles/Dockerfile.acceptance-backend +++ b/dockerfiles/Dockerfile.acceptance-backend @@ -7,8 +7,11 @@ FROM plone/plone-backend:${PLONE_VERSION:-6} # 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"] + +# ENTRYPOINT ["/bin/bash"] +ENTRYPOINT [ "/app/docker-entrypoint.sh" ] +CMD ["/app/bin/robot-server", "plone.app.robotframework.testing.PLONE_ROBOT_TESTING"] + # ARG EXTRA_PACKAGES