From 99c7758799b7dd02fc5558dba713b3f227602d86 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Tue, 20 Mar 2018 10:59:59 +0800 Subject: [PATCH] update default install arg and remove extra run command --- workspace/Dockerfile-56 | 4 ++-- workspace/Dockerfile-70 | 4 ++-- workspace/Dockerfile-71 | 5 ----- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 9dc76b34..141b05c3 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -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 \ diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index f9c5b0ca..2eb8d91d 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -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 \ diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 4ae3cfe9..67afae58 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -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