From 78505b49d17154d182bd2a4b94ba6acfe3533888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Andrei?= <ericof@gmail.com>
Date: Tue, 1 Aug 2023 12:02:08 -0300
Subject: [PATCH] Update Dockerfile.acceptance

---
 Makefile                          |  1 +
 acceptance/docker-compose.yml     |  2 --
 dockerfiles/Dockerfile.acceptance | 11 +++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 937859f..d6b5669 100644
--- a/Makefile
+++ b/Makefile
@@ -140,6 +140,7 @@ start-test-acceptance-server: ## Start acceptance server
 .PHONY: start-test-acceptance-server-prod
 start-test-acceptance-server-prod: ## Start acceptance server
 	${ACCEPTANCE} --profile prod up -d
+
 .PHONY: test-acceptance
 test-acceptance: ## Start Cypress
 	(cd acceptance && ./node_modules/.bin/cypress open)
diff --git a/acceptance/docker-compose.yml b/acceptance/docker-compose.yml
index 6c1721b..610bf05 100644
--- a/acceptance/docker-compose.yml
+++ b/acceptance/docker-compose.yml
@@ -36,8 +36,6 @@ services:
         ADDON_NAME: "${ADDON_NAME}"
         ADDON_PATH: "${ADDON_PATH}"
         VOLTO_VERSION: ${VOLTO_VERSION:-16}
-    volumes:
-      - ${CURRENT_DIR}:/app/src/addons/${ADDON_PATH}/
     environment:
       RAZZLE_INTERNAL_API_PATH: http://backend-acceptance:55001/plone
       RAZZLE_API_PATH: http://localhost:55001/plone
diff --git a/dockerfiles/Dockerfile.acceptance b/dockerfiles/Dockerfile.acceptance
index 810df61..dc20a0e 100644
--- a/dockerfiles/Dockerfile.acceptance
+++ b/dockerfiles/Dockerfile.acceptance
@@ -1,14 +1,21 @@
 # syntax=docker/dockerfile:1
 ARG VOLTO_VERSION
-FROM plone/frontend-dev:${VOLTO_VERSION}
+FROM plone/frontend-dev:${VOLTO_VERSION} as builder
 
 ARG ADDON_NAME
 ARG ADDON_PATH
 
-COPY --chown=node:node package.json /app/src/addons/${ADDON_PATH}/
+COPY --chown=node:node . /app/src/addons/${ADDON_PATH}/
 
 RUN <<EOT
     set -e
     /setupAddon
     yarn install --network-timeout 1000000
+    yarn build
+    rm -rf cache omelette .yarn/cache
 EOT
+
+FROM plone/frontend-prod-config:${VOLTO_VERSION}
+
+# Copy Volto project
+COPY --from=builder /app/ /app/