Skip to content

Commit 5a47080

Browse files
This issue relates to laradock#563, which also occurs on Mac. This has been one of the solutions proposed.
1 parent f296a39 commit 5a47080

3 files changed

Lines changed: 18 additions & 6 deletions

File tree

workspace/Dockerfile-56

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,17 @@ COPY ./aliases.sh /home/laradock/aliases.sh
117117
RUN echo "" >> ~/.bashrc && \
118118
echo "# Load Custom Aliases" >> ~/.bashrc && \
119119
echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
120-
echo "" >> ~/.bashrc
120+
echo "" >> ~/.bashrc && \
121+
sed -i 's/\r//' /home/laradock/aliases.sh && \
122+
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
121123

122124
USER root
123125
RUN echo "" >> ~/.bashrc && \
124126
echo "# Load Custom Aliases" >> ~/.bashrc && \
125127
echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
126-
echo "" >> ~/.bashrc
128+
echo "" >> ~/.bashrc && \
129+
sed -i 's/\r//' /home/laradock/aliases.sh && \
130+
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
127131

128132
#####################################
129133
# xDebug:

workspace/Dockerfile-70

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,17 @@ COPY ./aliases.sh /home/laradock/aliases.sh
117117
RUN echo "" >> ~/.bashrc && \
118118
echo "# Load Custom Aliases" >> ~/.bashrc && \
119119
echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
120-
echo "" >> ~/.bashrc
120+
echo "" >> ~/.bashrc && \
121+
sed -i 's/\r//' /home/laradock/aliases.sh && \
122+
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
121123

122124
USER root
123125
RUN echo "" >> ~/.bashrc && \
124126
echo "# Load Custom Aliases" >> ~/.bashrc && \
125127
echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
126-
echo "" >> ~/.bashrc
128+
echo "" >> ~/.bashrc && \
129+
sed -i 's/\r//' /home/laradock/aliases.sh && \
130+
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
127131

128132
#####################################
129133
# xDebug:

workspace/Dockerfile-71

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,17 @@ COPY ./aliases.sh /home/laradock/aliases.sh
113113
RUN echo "" >> ~/.bashrc && \
114114
echo "# Load Custom Aliases" >> ~/.bashrc && \
115115
echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
116-
echo "" >> ~/.bashrc
116+
echo "" >> ~/.bashrc && \
117+
sed -i 's/\r//' /home/laradock/aliases.sh && \
118+
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
117119

118120
USER root
119121
RUN echo "" >> ~/.bashrc && \
120122
echo "# Load Custom Aliases" >> ~/.bashrc && \
121123
echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \
122-
echo "" >> ~/.bashrc
124+
echo "" >> ~/.bashrc && \
125+
sed -i 's/\r//' /home/laradock/aliases.sh && \
126+
sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh
123127

124128
#####################################
125129
# xDebug:

0 commit comments

Comments
 (0)