From 9c387839a18b0a9bad9e62d3b4586525963cd1c4 Mon Sep 17 00:00:00 2001 From: Romain Lebbadi-Breteau <romain@lebbadi.fr> Date: Sat, 12 Feb 2022 10:23:37 -0500 Subject: [PATCH] Add yarn to Dockerfile.prod --- docker/Dockerfile | 4 ---- docker/Dockerfile.prod | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9625e27b..fa1a8b0f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -25,8 +25,4 @@ COPY docker/nginx.conf docker/calendar.conf /etc/nginx/ RUN apk add nodejs npm && npm install -g yarn - -# COPY --chown=root:root . . -# RUN composer install --prefer-dist --no-dev --optimize-autoloader - CMD composer install && wait-for-it database:5432 -- bin/console doctrine:migrations:migrate -n && yarn install && nginx && yarn encore dev --watch & php-fpm diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index 4368c8fc..00fbf06f 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -25,4 +25,6 @@ COPY docker/nginx.conf docker/calendar.conf /etc/nginx/ COPY --chown=root:root . . RUN composer install --prefer-dist --no-dev --optimize-autoloader -CMD php bin/console cache:clear && wait-for-it database:5432 -- bin/console doctrine:migrations:migrate -n && nginx && php-fpm +RUN apk add nodejs npm && npm install -g yarn && yarn install + +CMD php bin/console cache:clear && wait-for-it database:5432 -- bin/console doctrine:migrations:migrate -n && yarn encore prod && nginx && php-fpm -- GitLab