From 9f5f794e782976439958fd519c795f087d261bb7 Mon Sep 17 00:00:00 2001
From: Ferror <zmalcherczyk@gmail.com>
Date: Mon, 3 Oct 2022 22:50:50 +0200
Subject: [PATCH] [docker]Integrate production config docker with Webpack

---
 .dockerignore     |  1 +
 Dockerfile        | 23 +++++++++++++----------
 webpack.config.js |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 7105c89c3f..81d9a54338 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -25,6 +25,7 @@ node_modules/
 var/*
 vendor/
 public/assets/
+public/build/
 public/bundles/
 public/css/
 public/js/
diff --git a/Dockerfile b/Dockerfile
index 664e3a8656..c1b555c4ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ FROM composer:${COMPOSER_VERSION} AS composer
 
 FROM mlocati/php-extension-installer:${PHP_EXTENSION_INSTALLER_VERSION} AS php_extension_installer
 
-FROM php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION} AS sylius_php_prod
+FROM php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION} AS base
 
 # persistent / runtime deps
 RUN apk add --no-cache \
@@ -92,20 +92,23 @@ RUN set -eux; \
     yarn install; \
     yarn cache clean
 
-COPY --from=sylius_php_prod /srv/sylius/vendor/sylius/sylius/src/Sylius/Bundle/UiBundle/Resources/private       vendor/sylius/sylius/src/Sylius/Bundle/UiBundle/Resources/private/
-COPY --from=sylius_php_prod /srv/sylius/vendor/sylius/sylius/src/Sylius/Bundle/AdminBundle/Resources/private    vendor/sylius/sylius/src/Sylius/Bundle/AdminBundle/Resources/private/
-COPY --from=sylius_php_prod /srv/sylius/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle/Resources/private     vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle/Resources/private/
-COPY --from=sylius_php_prod /srv/sylius/assets ./assets
+COPY --from=base /srv/sylius/vendor/sylius/sylius/src/Sylius/Bundle/UiBundle/Resources/private       vendor/sylius/sylius/src/Sylius/Bundle/UiBundle/Resources/private/
+COPY --from=base /srv/sylius/vendor/sylius/sylius/src/Sylius/Bundle/AdminBundle/Resources/private    vendor/sylius/sylius/src/Sylius/Bundle/AdminBundle/Resources/private/
+COPY --from=base /srv/sylius/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle/Resources/private     vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle/Resources/private/
+COPY --from=base /srv/sylius/assets ./assets
 
 COPY webpack.config.js ./
-RUN set -eux; \
-    yarn build:prod;
+RUN yarn build:prod
 
 COPY docker/node/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
 RUN chmod +x /usr/local/bin/docker-entrypoint
 
 ENTRYPOINT ["docker-entrypoint"]
-CMD ["yarn", "build"]
+CMD ["yarn", "build:prod"]
+
+FROM base AS sylius_php_prod
+
+COPY --from=sylius_node /srv/sylius/public/build public/build
 
 FROM nginx:${NGINX_VERSION}-alpine AS sylius_nginx
 
@@ -113,8 +116,8 @@ COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/
 
 WORKDIR /srv/sylius
 
-COPY --from=sylius_php_prod /srv/sylius/public public/
-COPY --from=sylius_node     /srv/sylius/public public/
+COPY --from=base        /srv/sylius/public public/
+COPY --from=sylius_node /srv/sylius/public public/
 
 FROM sylius_php_prod AS sylius_php_dev
 
diff --git a/webpack.config.js b/webpack.config.js
index bf6cb88082..e1a473db3f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -44,7 +44,7 @@ adminConfig.resolve.alias['sylius/bundle'] = syliusBundles;
 adminConfig.externals = Object.assign({}, adminConfig.externals, { window: 'window', document: 'document' });
 adminConfig.name = 'admin';
 
-Encore.reset()
+Encore.reset();
 
 // App shop config
 Encore