Skip to content

Commit 895d69e

Browse files
committed
fix: fix the docker entrypoint on Alpine
1 parent c04f432 commit 895d69e

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

dev/docker/ci/alpine-gcc.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
66
# cleanup
77
rm -rf /var/cache/apk/*
88

9-
SHELL ["/bin/bash", "-l", "-c"]
10-
ENTRYPOINT ["/bin/bash", "-l"]
9+
SHELL ["/entrypoint.sh", "/bin/sh", "-c"]
10+
ENTRYPOINT ["/entrypoint.sh", "/bin/sh"]

dev/docker/ci/alpine-llvm.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
66
# cleanup
77
rm -rf /var/cache/apk/*
88

9-
SHELL ["/bin/bash", "-l", "-c"]
10-
ENTRYPOINT ["/bin/bash", "-l"]
9+
SHELL ["/entrypoint.sh", "/bin/sh", "-c"]
10+
ENTRYPOINT ["/entrypoint.sh", "/bin/sh"]

dev/docker/ci/alpine-mingw.dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
FROM aminya/setup-cpp-alpine:latest AS setup-cpp-alpine-mingw
22

3-
COPY "./dist/modern" "/usr/lib/setup-cpp/"
4-
53
# install mingw/powershell
64
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
75
--compiler mingw \
86
--powershell true && \
97
# cleanup
108
rm -rf /var/cache/apk/*
119

12-
SHELL ["/bin/bash", "-l", "-c"]
13-
ENTRYPOINT ["/bin/bash", "-l"]
10+
SHELL ["/entrypoint.sh", "/bin/sh", "-c"]
11+
ENTRYPOINT ["/entrypoint.sh", "/bin/sh"]

dev/docker/ci/alpine.dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,9 @@ RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
2626
# cleanup
2727
rm -rf /var/cache/apk/*
2828

29-
SHELL ["/bin/bash", "-l", "-c"]
30-
ENTRYPOINT ["/bin/bash", "-l"]
29+
# Custom entrypoint due to bash -l limitations on Alpine
30+
RUN printf '#!/bin/bash\nsource $HOME/.cpprc\nexec "$@"\n' > /entrypoint.sh && \
31+
chmod +x /entrypoint.sh
32+
33+
SHELL ["/entrypoint.sh", "/bin/sh", "-c"]
34+
ENTRYPOINT ["/entrypoint.sh", "/bin/sh"]

0 commit comments

Comments
 (0)