diff --git a/docker/Dockerfile b/docker/Dockerfile index 9625e27b5d0f9f5b303f8b146f160d782c7a8dfb..fa1a8b0f493388dc88d61572994bf0264aa44547 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 4368c8fcde30cf36d3d27fbaff6278fc1ba7b3dc..00fbf06fb30f04b4bffa97b4fe5ea27b84a56e27 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