Skip to content

L
laradock
Commit 4d384c0a authored by Shao Yu Lung's avatar Shao Yu Lung
Browse files
Options

fix mistake #1427 about user aliases.

parent 9a9d30f1
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 20 deletions
workspace/Dockerfile-56
View file @ 4d384c0a
...@@ -151,14 +151,22 @@ RUN chmod -R 644 /etc/cron.d ...@@ -151,14 +151,22 @@ RUN chmod -R 644 /etc/cron.d
##################################### #####################################
USER root USER root
COPY ./aliases.sh /root/aliases.sh
COPY ./aliases.sh /home/laradock/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 && \ RUN echo "" >> ~/.bashrc && \
echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \
echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \ echo "source ~/aliases.sh" >> ~/.bashrc && \
echo "" >> ~/.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
##################################### #####################################
# xDebug: # xDebug:
......
workspace/Dockerfile-70
View file @ 4d384c0a
...@@ -148,14 +148,22 @@ RUN chmod -R 644 /etc/cron.d ...@@ -148,14 +148,22 @@ RUN chmod -R 644 /etc/cron.d
##################################### #####################################
USER root USER root
COPY ./aliases.sh /root/aliases.sh
COPY ./aliases.sh /home/laradock/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 && \ RUN echo "" >> ~/.bashrc && \
echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \
echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \ echo "source ~/aliases.sh" >> ~/.bashrc && \
echo "" >> ~/.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
##################################### #####################################
# xDebug: # xDebug:
......
workspace/Dockerfile-71
View file @ 4d384c0a
...@@ -143,14 +143,22 @@ RUN chmod -R 644 /etc/cron.d ...@@ -143,14 +143,22 @@ RUN chmod -R 644 /etc/cron.d
##################################### #####################################
USER root USER root
COPY ./aliases.sh /root/aliases.sh
COPY ./aliases.sh /home/laradock/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 && \ RUN echo "" >> ~/.bashrc && \
echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \
echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \ echo "source ~/aliases.sh" >> ~/.bashrc && \
echo "" >> ~/.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
##################################### #####################################
# xDebug: # xDebug:
......
workspace/Dockerfile-72
View file @ 4d384c0a
...@@ -143,14 +143,22 @@ RUN chmod -R 644 /etc/cron.d ...@@ -143,14 +143,22 @@ RUN chmod -R 644 /etc/cron.d
##################################### #####################################
USER root USER root
COPY ./aliases.sh /root/aliases.sh
COPY ./aliases.sh /home/laradock/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 && \ RUN echo "" >> ~/.bashrc && \
echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \
echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \ echo "source ~/aliases.sh" >> ~/.bashrc && \
echo "" >> ~/.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
##################################### #####################################
# xDebug: # xDebug:
......
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