mirror of
https://github.com/Aviortheking/CA_LARAVEL.git
synced 2025-04-23 19:32:11 +00:00
fix merge
This commit is contained in:
commit
da49d3bcfa
@ -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
10198
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user