Skip to content

L
laradock
Unverified Commit c5c4d194 authored by Yu-Lung Shao (Allen)'s avatar Yu-Lung Shao (Allen) Committed by GitHub
Browse files
Options

Merge pull request #1427 from bestlong/workspace-user-aliase-remove-duplicate-command 

workspace Dockerfile remove duplicate command in User Aliases section.
parents 188a7d76 40796651
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 32 deletions
workspace/Dockerfile-56
View file @ c5c4d194
...@@ -159,17 +159,10 @@ RUN echo "" >> ~/.bashrc && \ ...@@ -159,17 +159,10 @@ RUN echo "" >> ~/.bashrc && \
sed -i 's/\r//' /home/laradock/aliases.sh && \ sed -i 's/\r//' /home/laradock/aliases.sh && \
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /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: # xDebug:
##################################### #####################################
USER root
ARG INSTALL_XDEBUG=false ARG INSTALL_XDEBUG=false
RUN if [ ${INSTALL_XDEBUG} = true ]; then \ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
......
workspace/Dockerfile-70
View file @ c5c4d194
...@@ -156,17 +156,10 @@ RUN echo "" >> ~/.bashrc && \ ...@@ -156,17 +156,10 @@ RUN echo "" >> ~/.bashrc && \
sed -i 's/\r//' /home/laradock/aliases.sh && \ sed -i 's/\r//' /home/laradock/aliases.sh && \
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /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: # xDebug:
##################################### #####################################
USER root
ARG INSTALL_XDEBUG=false ARG INSTALL_XDEBUG=false
RUN if [ ${INSTALL_XDEBUG} = true ]; then \ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
......
workspace/Dockerfile-71
View file @ c5c4d194
...@@ -151,17 +151,10 @@ RUN echo "" >> ~/.bashrc && \ ...@@ -151,17 +151,10 @@ RUN echo "" >> ~/.bashrc && \
sed -i 's/\r//' /home/laradock/aliases.sh && \ sed -i 's/\r//' /home/laradock/aliases.sh && \
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /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: # xDebug:
##################################### #####################################
USER root
ARG INSTALL_XDEBUG=false ARG INSTALL_XDEBUG=false
RUN if [ ${INSTALL_XDEBUG} = true ]; then \ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
......
workspace/Dockerfile-72
View file @ c5c4d194
...@@ -151,17 +151,10 @@ RUN echo "" >> ~/.bashrc && \ ...@@ -151,17 +151,10 @@ RUN echo "" >> ~/.bashrc && \
sed -i 's/\r//' /home/laradock/aliases.sh && \ sed -i 's/\r//' /home/laradock/aliases.sh && \
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /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: # xDebug:
##################################### #####################################
USER root
ARG INSTALL_XDEBUG=false ARG INSTALL_XDEBUG=false
RUN if [ ${INSTALL_XDEBUG} = true ]; then \ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment