Replace /bin/sh with a wrapper to /bin/bash

This is needed to be able to set umask=022 for the Linux aarch64
images that use umask=027 by default.

/bin/sh does not load /etc/profile nor any other rcfile.

See bioconda/bioconda-recipes#46177 for full
details and galaxyproject/galaxy#17631 for a
summary.

Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>

.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'

.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'
 

.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:

images/base-glibc-busybox-bash/Dockerfile.busybox

@@ -17,6 +17,15 @@ RUN [ ! -f /etc/apt/sources.list ] || sed --in-place= --regexp-extended \
 WORKDIR /build
 COPY build-busybox ./
 ARG busybox_version
+
+RUN echo "umask 022" >> /etc/profile
+RUN echo "umask 022" >> /root/.bashrc
+
+# replace /bin/sh with a wrapper to /bin/bash
+RUN /bin/bash -c "unlink /bin/sh"
+COPY bin-sh-wrapper.sh /bin/sh
+RUN /bin/bash -c "chmod +x /bin/sh"
+
 RUN ./build-busybox \
     "${busybox_version}" \
     x86_64 aarch64

images/base-glibc-busybox-bash/bin-sh-wrapper.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash -l "$@"

images/base-glibc-debian-bash/Dockerfile

@@ -127,5 +127,14 @@ RUN touch /usr/local/env-activate.sh \
       > /usr/local/env-execute
 
 ENV LANG=C.UTF-8
+
+RUN echo "umask 022" >> /etc/profile
+RUN echo "umask 022" >> /root/.bashrc
+
+# replace /bin/sh with a wrapper to /bin/bash
+RUN /bin/bash -c "unlink /bin/sh"
+COPY bin-sh-wrapper.sh /bin/sh
+RUN /bin/bash -c "chmod +x /bin/sh"
+
 ENTRYPOINT [ "/usr/local/env-execute" ]
 CMD [ "bash" ]

images/base-glibc-debian-bash/bin-sh-wrapper.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash -l "$@"

images/bin-sh-wrapper.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash -l "$@"

images/create-env/Dockerfile

@@ -40,5 +40,13 @@ RUN \
       >>   /etc/skel/.bashrc
 ENV ENV=/etc/profile.d/conda.sh
 
+RUN echo "umask 022" >> /etc/profile
+RUN echo "umask 022" >> /root/.bashrc
+
+# replace /bin/sh with a wrapper to /bin/bash
+RUN /bin/bash -c "unlink /bin/sh"
+COPY bin-sh-wrapper.sh /bin/sh
+RUN /bin/bash -c "chmod +x /bin/sh"
+
 ENTRYPOINT [ "/opt/create-env/bin/tini", "--", "/opt/create-env/env-execute" ]
 CMD [ "bash" ]

images/create-env/bin-sh-wrapper.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash -l "$@"