ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1444 from bestlong/clean-up-workspace-laravel 

update default install arg and remove extra run command
This commit is contained in:
Yu-Lung Shao (Allen) 2018-03-20 13:59:27 +08:00 committed by GitHub
parent 164069c256 99c7758799
commit 9a9d30f173
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
workspace/Dockerfile-56
View File

@ -439,7 +439,7 @@ RUN echo "" >> ~/.bashrc && \
#####################################
USER laradock
ARG INSTALL_LARAVEL_ENVOY=true
ARG INSTALL_LARAVEL_ENVOY=false
ENV INSTALL_LARAVEL_ENVOY ${INSTALL_LARAVEL_ENVOY}
RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \
@ -459,7 +459,7 @@ RUN if [ ${COMPOSER_REPO_PACKAGIST} ]; then \
composer config -g repo.packagist composer ${COMPOSER_REPO_PACKAGIST} \
;fi
ARG INSTALL_LARAVEL_INSTALLER=true
ARG INSTALL_LARAVEL_INSTALLER=false
ENV INSTALL_LARAVEL_INSTALLER ${INSTALL_LARAVEL_INSTALLER}
RUN if [ ${INSTALL_LARAVEL_INSTALLER} = true ]; then \

4
workspace/Dockerfile-70
View File

@ -435,7 +435,7 @@ RUN echo "" >> ~/.bashrc && \
#####################################
USER laradock
ARG INSTALL_LARAVEL_ENVOY=true
ARG INSTALL_LARAVEL_ENVOY=false
ENV INSTALL_LARAVEL_ENVOY ${INSTALL_LARAVEL_ENVOY}
RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \
@ -455,7 +455,7 @@ RUN if [ ${COMPOSER_REPO_PACKAGIST} ]; then \
composer config -g repo.packagist composer ${COMPOSER_REPO_PACKAGIST} \
;fi
ARG INSTALL_LARAVEL_INSTALLER=true
ARG INSTALL_LARAVEL_INSTALLER=false
ENV INSTALL_LARAVEL_INSTALLER ${INSTALL_LARAVEL_INSTALLER}
RUN if [ ${INSTALL_LARAVEL_INSTALLER} = true ]; then \

5
workspace/Dockerfile-71
View File

@ -429,11 +429,6 @@ RUN echo "" >> ~/.bashrc && \
#####################################
# Laravel Envoy:
#####################################
USER root
RUN apt-get update -yqq \
&& apt-get install -y php-curl
USER laradock
ARG INSTALL_LARAVEL_ENVOY=false