fix merge

This commit is contained in:
jenoh 2020-06-29 14:55:27 +02:00
commit da49d3bcfa
2 changed files with 2 additions and 10200 deletions

View File

@ -48,12 +48,12 @@ USER www-data
COPY --chown=www-data:www-data . . COPY --chown=www-data:www-data . .
# install composer deps && env # install composer deps && env
RUN export COMPOSER_CACHE_DIR="/dev/null"; composer install --no-progress RUN composer global require hirak/prestissimo; composer install --no-progress
#&& composer dump-env prod #&& composer dump-env prod
# Install frontend deps and build frontend # Install frontend deps and build frontend
RUN yarn \ RUN yarn \
&& yarn build && yarn development
# change user back to the root user to finish building # change user back to the root user to finish building
USER root USER root

10198
package-lock.json generated

File diff suppressed because it is too large Load Diff