From 4d384c0a67acd732ab60aa856cbd41032d0e4c2e Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Fri, 23 Mar 2018 15:17:35 +0800 Subject: [PATCH 1/2] fix mistake #1427 about user aliases. --- workspace/Dockerfile-56 | 18 +++++++++++++----- workspace/Dockerfile-70 | 18 +++++++++++++----- workspace/Dockerfile-71 | 18 +++++++++++++----- workspace/Dockerfile-72 | 18 +++++++++++++----- 4 files changed, 52 insertions(+), 20 deletions(-) diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 141b05c3..964ecb87 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -151,14 +151,22 @@ RUN chmod -R 644 /etc/cron.d ##################################### USER root +COPY ./aliases.sh /root/aliases.sh COPY ./aliases.sh /home/laradock/aliases.sh + +RUN sed -i 's/\r//' /root/aliases.sh && \ + sed -i 's/\r//' /home/laradock/aliases.sh && \ + echo "" >> ~/.bashrc && \ + echo "# Load Custom Aliases" >> ~/.bashrc && \ + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc + +USER laradock + 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 && \ - chown laradock:laradock /home/laradock/aliases.sh + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc ##################################### # xDebug: diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 2eb8d91d..2d7194c0 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -148,14 +148,22 @@ RUN chmod -R 644 /etc/cron.d ##################################### USER root +COPY ./aliases.sh /root/aliases.sh COPY ./aliases.sh /home/laradock/aliases.sh + +RUN sed -i 's/\r//' /root/aliases.sh && \ + sed -i 's/\r//' /home/laradock/aliases.sh && \ + echo "" >> ~/.bashrc && \ + echo "# Load Custom Aliases" >> ~/.bashrc && \ + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc + +USER laradock + 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 && \ - chown laradock:laradock /home/laradock/aliases.sh + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc ##################################### # xDebug: diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 67afae58..80a73d5e 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -143,14 +143,22 @@ RUN chmod -R 644 /etc/cron.d ##################################### USER root +COPY ./aliases.sh /root/aliases.sh COPY ./aliases.sh /home/laradock/aliases.sh + +RUN sed -i 's/\r//' /root/aliases.sh && \ + sed -i 's/\r//' /home/laradock/aliases.sh && \ + echo "" >> ~/.bashrc && \ + echo "# Load Custom Aliases" >> ~/.bashrc && \ + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc + +USER laradock + 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 && \ - chown laradock:laradock /home/laradock/aliases.sh + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc ##################################### # xDebug: diff --git a/workspace/Dockerfile-72 b/workspace/Dockerfile-72 index 7852a1b3..ad025cac 100644 --- a/workspace/Dockerfile-72 +++ b/workspace/Dockerfile-72 @@ -143,14 +143,22 @@ RUN chmod -R 644 /etc/cron.d ##################################### USER root +COPY ./aliases.sh /root/aliases.sh COPY ./aliases.sh /home/laradock/aliases.sh + +RUN sed -i 's/\r//' /root/aliases.sh && \ + sed -i 's/\r//' /home/laradock/aliases.sh && \ + echo "" >> ~/.bashrc && \ + echo "# Load Custom Aliases" >> ~/.bashrc && \ + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc + +USER laradock + 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 && \ - chown laradock:laradock /home/laradock/aliases.sh + echo "source ~/aliases.sh" >> ~/.bashrc && \ + echo "" >> ~/.bashrc ##################################### # xDebug: From 141d2dbe7fb035b6aa4333709d1c9312ebae1070 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Fri, 23 Mar 2018 16:09:10 +0800 Subject: [PATCH 2/2] fix file owner. --- workspace/Dockerfile-56 | 1 + workspace/Dockerfile-70 | 1 + workspace/Dockerfile-71 | 1 + workspace/Dockerfile-72 | 1 + 4 files changed, 4 insertions(+) diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 964ecb87..b5756a58 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -156,6 +156,7 @@ COPY ./aliases.sh /home/laradock/aliases.sh RUN sed -i 's/\r//' /root/aliases.sh && \ sed -i 's/\r//' /home/laradock/aliases.sh && \ + chown laradock:laradock /home/laradock/aliases.sh && \ echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "source ~/aliases.sh" >> ~/.bashrc && \ diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 2d7194c0..340afeff 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -153,6 +153,7 @@ COPY ./aliases.sh /home/laradock/aliases.sh RUN sed -i 's/\r//' /root/aliases.sh && \ sed -i 's/\r//' /home/laradock/aliases.sh && \ + chown laradock:laradock /home/laradock/aliases.sh && \ echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "source ~/aliases.sh" >> ~/.bashrc && \ diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 80a73d5e..e7f80cfb 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -148,6 +148,7 @@ COPY ./aliases.sh /home/laradock/aliases.sh RUN sed -i 's/\r//' /root/aliases.sh && \ sed -i 's/\r//' /home/laradock/aliases.sh && \ + chown laradock:laradock /home/laradock/aliases.sh && \ echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "source ~/aliases.sh" >> ~/.bashrc && \ diff --git a/workspace/Dockerfile-72 b/workspace/Dockerfile-72 index ad025cac..f2b1cc5c 100644 --- a/workspace/Dockerfile-72 +++ b/workspace/Dockerfile-72 @@ -148,6 +148,7 @@ COPY ./aliases.sh /home/laradock/aliases.sh RUN sed -i 's/\r//' /root/aliases.sh && \ sed -i 's/\r//' /home/laradock/aliases.sh && \ + chown laradock:laradock /home/laradock/aliases.sh && \ echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "source ~/aliases.sh" >> ~/.bashrc && \