From b2136d4fbd99269293f5ee441ba97dd62ed0ed42 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Fri, 24 Jul 2020 15:33:27 -0500
Subject: [PATCH] Fixed docker entrypoint so it plays nicely with CI
---
containers/builder/Dockerfile | 7 +++++--
containers/release/Dockerfile | 8 ++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/containers/builder/Dockerfile b/containers/builder/Dockerfile
index 87702c47f..95d0ea10f 100644
--- a/containers/builder/Dockerfile
+++ b/containers/builder/Dockerfile
@@ -52,5 +52,8 @@ RUN cd /opt/spack-environment && \
spack env activate --sh -d . >> /etc/profile.d/z10_spack_environment.sh && \
echo "export BINARY_TAG=x86_64-linux-gcc9-opt" >> /etc/profile.d/z10_spack_environment.sh
-ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l", "-c"]
-CMD ["bash"]
+## make sure we have the entrypoints setup correctly
+ENTRYPOINT []
+CMD ["bash", "--rcfile", "/etc/profile", "-l"]
+USER 0
+WORKDIR /
diff --git a/containers/release/Dockerfile b/containers/release/Dockerfile
index 9c71766f5..ab677c9c1 100644
--- a/containers/release/Dockerfile
+++ b/containers/release/Dockerfile
@@ -24,7 +24,11 @@ COPY --from=builder /opt/spack-environment /opt/spack-environment
COPY --from=builder /opt/software /opt/software
COPY --from=builder /opt/view /opt/view
COPY --from=builder /etc/profile.d/z10_spack_environment.sh /etc/profile.d/z10_spack_environment.sh
+## Setup global bashrc, useful for singularity
COPY --from=builder /root/.bashrc /etc/bash.bashrc
-ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l", "-c"]
-CMD ["bash"]
+## make sure we have the entrypoints setup correctly
+ENTRYPOINT []
+CMD ["bash", "--rcfile", "/etc/profile", "-l"]
+USER 0
+WORKDIR /
--
GitLab