Skip to content

Commit c5c4d19

Browse files
authored
Merge pull request laradock#1427 from bestlong/workspace-user-aliase-remove-duplicate-command
workspace Dockerfile remove duplicate command in User Aliases section.
2 parents 188a7d7 + 4079665 commit c5c4d19

4 files changed

Lines changed: 4 additions & 32 deletions

File tree

workspace/Dockerfile-56

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,10 @@ RUN echo "" >> ~/.bashrc && \
159159
sed -i 's/\r//' /home/laradock/aliases.sh && \
160160
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
161161

162-
USER root
163-
RUN echo "" >> ~/.bashrc && \
164-
echo "# Load Custom Aliases" >> ~/.bashrc && \
165-
echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
166-
echo "" >> ~/.bashrc && \
167-
sed -i 's/\r//' /home/laradock/aliases.sh && \
168-
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
169-
170162
#####################################
171163
# xDebug:
172164
#####################################
165+
USER root
173166

174167
ARG INSTALL_XDEBUG=false
175168
RUN if [ ${INSTALL_XDEBUG} = true ]; then \

workspace/Dockerfile-70

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,10 @@ RUN echo "" >> ~/.bashrc && \
156156
sed -i 's/\r//' /home/laradock/aliases.sh && \
157157
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
158158

159-
USER root
160-
RUN echo "" >> ~/.bashrc && \
161-
echo "# Load Custom Aliases" >> ~/.bashrc && \
162-
echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
163-
echo "" >> ~/.bashrc && \
164-
sed -i 's/\r//' /home/laradock/aliases.sh && \
165-
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
166-
167159
#####################################
168160
# xDebug:
169161
#####################################
162+
USER root
170163

171164
ARG INSTALL_XDEBUG=false
172165
RUN if [ ${INSTALL_XDEBUG} = true ]; then \

workspace/Dockerfile-71

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,17 +151,10 @@ RUN echo "" >> ~/.bashrc && \
151151
sed -i 's/\r//' /home/laradock/aliases.sh && \
152152
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
153153

154-
USER root
155-
RUN echo "" >> ~/.bashrc && \
156-
echo "# Load Custom Aliases" >> ~/.bashrc && \
157-
echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
158-
echo "" >> ~/.bashrc && \
159-
sed -i 's/\r//' /home/laradock/aliases.sh && \
160-
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
161-
162154
#####################################
163155
# xDebug:
164156
#####################################
157+
USER root
165158

166159
ARG INSTALL_XDEBUG=false
167160
RUN if [ ${INSTALL_XDEBUG} = true ]; then \

workspace/Dockerfile-72

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,17 +151,10 @@ RUN echo "" >> ~/.bashrc && \
151151
sed -i 's/\r//' /home/laradock/aliases.sh && \
152152
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
153153

154-
USER root
155-
RUN echo "" >> ~/.bashrc && \
156-
echo "# Load Custom Aliases" >> ~/.bashrc && \
157-
echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
158-
echo "" >> ~/.bashrc && \
159-
sed -i 's/\r//' /home/laradock/aliases.sh && \
160-
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
161-
162154
#####################################
163155
# xDebug:
164156
#####################################
157+
USER root
165158

166159
ARG INSTALL_XDEBUG=false
167160
RUN if [ ${INSTALL_XDEBUG} = true ]; then \

0 commit comments

Comments
 (0)