From 895d69ee98704793dc680c4ebd922d8a9dd3c367 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sun, 23 Mar 2025 11:02:13 -0700 Subject: [PATCH] fix: fix the docker entrypoint on Alpine --- dev/docker/ci/alpine-gcc.dockerfile | 4 ++-- dev/docker/ci/alpine-llvm.dockerfile | 4 ++-- dev/docker/ci/alpine-mingw.dockerfile | 6 ++---- dev/docker/ci/alpine.dockerfile | 8 ++++++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dev/docker/ci/alpine-gcc.dockerfile b/dev/docker/ci/alpine-gcc.dockerfile index 1babdcae..e6f62664 100644 --- a/dev/docker/ci/alpine-gcc.dockerfile +++ b/dev/docker/ci/alpine-gcc.dockerfile @@ -6,5 +6,5 @@ RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \ # cleanup rm -rf /var/cache/apk/* -SHELL ["/bin/bash", "-l", "-c"] -ENTRYPOINT ["/bin/bash", "-l"] +SHELL ["/entrypoint.sh", "/bin/sh", "-c"] +ENTRYPOINT ["/entrypoint.sh", "/bin/sh"] diff --git a/dev/docker/ci/alpine-llvm.dockerfile b/dev/docker/ci/alpine-llvm.dockerfile index 0dd6b7f7..d0d45236 100644 --- a/dev/docker/ci/alpine-llvm.dockerfile +++ b/dev/docker/ci/alpine-llvm.dockerfile @@ -6,5 +6,5 @@ RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \ # cleanup rm -rf /var/cache/apk/* -SHELL ["/bin/bash", "-l", "-c"] -ENTRYPOINT ["/bin/bash", "-l"] +SHELL ["/entrypoint.sh", "/bin/sh", "-c"] +ENTRYPOINT ["/entrypoint.sh", "/bin/sh"] diff --git a/dev/docker/ci/alpine-mingw.dockerfile b/dev/docker/ci/alpine-mingw.dockerfile index c68b9817..16c60aac 100644 --- a/dev/docker/ci/alpine-mingw.dockerfile +++ b/dev/docker/ci/alpine-mingw.dockerfile @@ -1,7 +1,5 @@ FROM aminya/setup-cpp-alpine:latest AS setup-cpp-alpine-mingw -COPY "./dist/modern" "/usr/lib/setup-cpp/" - # install mingw/powershell RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \ --compiler mingw \ @@ -9,5 +7,5 @@ RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \ # cleanup rm -rf /var/cache/apk/* -SHELL ["/bin/bash", "-l", "-c"] -ENTRYPOINT ["/bin/bash", "-l"] +SHELL ["/entrypoint.sh", "/bin/sh", "-c"] +ENTRYPOINT ["/entrypoint.sh", "/bin/sh"] diff --git a/dev/docker/ci/alpine.dockerfile b/dev/docker/ci/alpine.dockerfile index 7e3c5a89..f58d0a3a 100644 --- a/dev/docker/ci/alpine.dockerfile +++ b/dev/docker/ci/alpine.dockerfile @@ -26,5 +26,9 @@ RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \ # cleanup rm -rf /var/cache/apk/* -SHELL ["/bin/bash", "-l", "-c"] -ENTRYPOINT ["/bin/bash", "-l"] +# Custom entrypoint due to bash -l limitations on Alpine +RUN printf '#!/bin/bash\nsource $HOME/.cpprc\nexec "$@"\n' > /entrypoint.sh && \ + chmod +x /entrypoint.sh + +SHELL ["/entrypoint.sh", "/bin/sh", "-c"] +ENTRYPOINT ["/entrypoint.sh", "/bin/sh"]