From 40796651f6ec1f023524bbb74ea2ec951a34539a Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Thu, 15 Mar 2018 11:22:43 +0800 Subject: [PATCH] workspace Dockerfile remove duplicate command in User Aliases section. --- workspace/Dockerfile-56 | 9 +-------- workspace/Dockerfile-70 | 9 +-------- workspace/Dockerfile-71 | 9 +-------- workspace/Dockerfile-72 | 9 +-------- 4 files changed, 4 insertions(+), 32 deletions(-) diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 8f59dde..f05a928 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -159,17 +159,10 @@ RUN echo "" >> ~/.bashrc && \ sed -i 's/\r//' /home/laradock/aliases.sh && \ sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh -USER root -RUN echo "" >> ~/.bashrc && \ - echo "# Load Custom Aliases" >> ~/.bashrc && \ - echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \ - echo "" >> ~/.bashrc && \ - sed -i 's/\r//' /home/laradock/aliases.sh && \ - sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh - ##################################### # xDebug: ##################################### +USER root ARG INSTALL_XDEBUG=false RUN if [ ${INSTALL_XDEBUG} = true ]; then \ diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 5f65968..b373c45 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -156,17 +156,10 @@ RUN echo "" >> ~/.bashrc && \ sed -i 's/\r//' /home/laradock/aliases.sh && \ sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh -USER root -RUN echo "" >> ~/.bashrc && \ - echo "# Load Custom Aliases" >> ~/.bashrc && \ - echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \ - echo "" >> ~/.bashrc && \ - sed -i 's/\r//' /home/laradock/aliases.sh && \ - sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh - ##################################### # xDebug: ##################################### +USER root ARG INSTALL_XDEBUG=false RUN if [ ${INSTALL_XDEBUG} = true ]; then \ diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 0ed1b4f..faff08f 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -151,17 +151,10 @@ RUN echo "" >> ~/.bashrc && \ sed -i 's/\r//' /home/laradock/aliases.sh && \ sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh -USER root -RUN echo "" >> ~/.bashrc && \ - echo "# Load Custom Aliases" >> ~/.bashrc && \ - echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \ - echo "" >> ~/.bashrc && \ - sed -i 's/\r//' /home/laradock/aliases.sh && \ - sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh - ##################################### # xDebug: ##################################### +USER root ARG INSTALL_XDEBUG=false RUN if [ ${INSTALL_XDEBUG} = true ]; then \ diff --git a/workspace/Dockerfile-72 b/workspace/Dockerfile-72 index 327b584..a22c0a3 100644 --- a/workspace/Dockerfile-72 +++ b/workspace/Dockerfile-72 @@ -151,17 +151,10 @@ RUN echo "" >> ~/.bashrc && \ sed -i 's/\r//' /home/laradock/aliases.sh && \ sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh -USER root -RUN echo "" >> ~/.bashrc && \ - echo "# Load Custom Aliases" >> ~/.bashrc && \ - echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \ - echo "" >> ~/.bashrc && \ - sed -i 's/\r//' /home/laradock/aliases.sh && \ - sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh - ##################################### # xDebug: ##################################### +USER root ARG INSTALL_XDEBUG=false RUN if [ ${INSTALL_XDEBUG} = true ]; then \