update default install arg and remove extra run command

This commit is contained in:
Shao Yu Lung 2018-03-20 10:59:59 +08:00
parent 164069c256
commit 99c7758799
3 changed files with 4 additions and 9 deletions

View File

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

View File

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

View File

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