diff --git a/.github/workflows/base-glibc-busybox-bash.yaml b/.github/workflows/base-glibc-busybox-bash.yaml index 9f76c16d..1d2f785d 100644 --- a/.github/workflows/base-glibc-busybox-bash.yaml +++ b/.github/workflows/base-glibc-busybox-bash.yaml @@ -19,7 +19,7 @@ jobs: # The base image is not intended to change often and should be used with # version tags or checksum IDs, but not via "latest". MAJOR_VERSION: 3 - MINOR_VERSION: 0 + MINOR_VERSION: 1 IMAGE_NAME: base-glibc-busybox-bash BUSYBOX_VERSION: '1.36.1' DEBIAN_VERSION: '12.2' diff --git a/.github/workflows/base-glibc-debian-bash.yaml b/.github/workflows/base-glibc-debian-bash.yaml index 331f44ea..dc128ba1 100644 --- a/.github/workflows/base-glibc-debian-bash.yaml +++ b/.github/workflows/base-glibc-debian-bash.yaml @@ -19,7 +19,7 @@ jobs: # The base image is not intended to change often and should be used with # version tags or checksum IDs, but not via "latest". MAJOR_VERSION: 3 - MINOR_VERSION: 0 + MINOR_VERSION: 1 IMAGE_NAME: base-glibc-debian-bash DEBIAN_VERSION: '12.2' diff --git a/.github/workflows/create-env.yaml b/.github/workflows/create-env.yaml index 21162b41..ab528979 100644 --- a/.github/workflows/create-env.yaml +++ b/.github/workflows/create-env.yaml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-22.04 env: MAJOR_VERSION: 3 - MINOR_VERSION: 0 + MINOR_VERSION: 1 IMAGE_NAME: create-env steps: diff --git a/images/base-glibc-busybox-bash/Dockerfile.busybox b/images/base-glibc-busybox-bash/Dockerfile.busybox index fcbd60bd..7e175c08 100644 --- a/images/base-glibc-busybox-bash/Dockerfile.busybox +++ b/images/base-glibc-busybox-bash/Dockerfile.busybox @@ -17,6 +17,17 @@ RUN [ ! -f /etc/apt/sources.list ] || sed --in-place= --regexp-extended \ WORKDIR /build COPY build-busybox ./ ARG busybox_version + +SHELL ["/bin/bash", "-c"] + +RUN echo "umask 022" >> /etc/profile +RUN echo "umask 022" >> /root/.bashrc + +# replace /bin/sh with a wrapper to /bin/bash +RUN unlink /bin/sh +RUN echo 'bash -l "$@"' > /bin/sh +RUN chmod +x /bin/sh + RUN ./build-busybox \ "${busybox_version}" \ x86_64 aarch64 diff --git a/images/base-glibc-debian-bash/Dockerfile b/images/base-glibc-debian-bash/Dockerfile index c0adc292..70b7a981 100644 --- a/images/base-glibc-debian-bash/Dockerfile +++ b/images/base-glibc-debian-bash/Dockerfile @@ -127,5 +127,16 @@ RUN touch /usr/local/env-activate.sh \ > /usr/local/env-execute ENV LANG=C.UTF-8 + +SHELL ["/bin/bash", "-c"] + +RUN echo "umask 022" >> /etc/profile +RUN echo "umask 022" >> /root/.bashrc + +# replace /bin/sh with a wrapper to /bin/bash +RUN unlink /bin/sh +RUN echo 'bash -l "$@"' > /bin/sh +RUN chmod +x /bin/sh + ENTRYPOINT [ "/usr/local/env-execute" ] CMD [ "bash" ] diff --git a/images/create-env/Dockerfile b/images/create-env/Dockerfile index 93b83948..dad658a2 100644 --- a/images/create-env/Dockerfile +++ b/images/create-env/Dockerfile @@ -40,5 +40,16 @@ RUN \ >> /etc/skel/.bashrc ENV ENV=/etc/profile.d/conda.sh +SHELL ["/bin/bash", "-c"] + +RUN echo "umask 022" >> /etc/profile +RUN echo "umask 022" >> /root/.bashrc + +# replace /bin/sh with a thin wrapper to /bin/bash +RUN unlink /bin/sh +RUN echo 'bash -l "$@"' > /bin/sh +RUN chmod +x /bin/sh + + ENTRYPOINT [ "/opt/create-env/bin/tini", "--", "/opt/create-env/env-execute" ] CMD [ "bash" ]