Skip to content

Commit 6973b64

Browse files
author
Rui Yang
committed
Fix alpine build
since alpine sha256:e54013ea619fb2914af39087e0a8b0863b4ac3c498b5459b9f166514ed000147 the build failed by openssl error so the flag is added just like the one in ubuntu. It also failed by missing `git`, with error that libexec/git-core/git and bin/git is actually Sysmbolic link loop. I couldn't figure out why it deletes git and recreate symbolic link in the original code. Maybe a change in alpine that make our code invalid anymore. It ended up following the ubuntu dockerfile for those links. Since tests are passing so I assume the changes should not be breaking anything. Signed-off-by: Rui Yang <ruiya@vmware.com>
1 parent 4e5c4ea commit 6973b64

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

dockerfiles/alpine/Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,13 @@ RUN rm -f \
170170

171171
WORKDIR /usr/bin
172172
RUN rm -f \
173-
git \
174173
git-cvsserver \
175174
git-shell \
176175
git-receive-pack \
177176
git-upload-pack \
178177
git-upload-archive &&\
179-
ln -s ../libexec/git-core/git git &&\
180-
ln -s ../libexec/git-core/git-shell git-shell &&\
181-
ln -s ../libexec/git-core/git git-upload-archive &&\
182-
ln -s ../libexec/git-core/git-upload-pack git-upload-pack
178+
ln -s git git-upload-archive &&\
179+
ln -s git git-crypt
183180

184181
WORKDIR /usr/libexec/git-core
185182
RUN ln -s git git-merge

0 commit comments

Comments
 (0)