From 50003b49c5b62e93ac7eb2f4fbec0e86565adcbc Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Fri, 24 Jul 2020 14:48:41 -0500
Subject: [PATCH] Changed entrypoint in dockerfile to play nicer with CI
---
containers/builder/Dockerfile | 3 ++-
containers/release/Dockerfile | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/containers/builder/Dockerfile b/containers/builder/Dockerfile
index 6307dd679..100520e41 100644
--- a/containers/builder/Dockerfile
+++ b/containers/builder/Dockerfile
@@ -51,4 +51,5 @@ RUN find -L /opt/view/* -type f -exec readlink -f '{}' \; | \
RUN cd /opt/spack-environment && \
spack env activate --sh -d . >> /etc/profile.d/z10_spack_environment.sh
-ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l"]
+ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l", "-c"]
+CMD ["bash"]
diff --git a/containers/release/Dockerfile b/containers/release/Dockerfile
index 759dcf12d..9c71766f5 100644
--- a/containers/release/Dockerfile
+++ b/containers/release/Dockerfile
@@ -26,4 +26,5 @@ COPY --from=builder /opt/view /opt/view
COPY --from=builder /etc/profile.d/z10_spack_environment.sh /etc/profile.d/z10_spack_environment.sh
COPY --from=builder /root/.bashrc /etc/bash.bashrc
-ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l"]
+ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l", "-c"]
+CMD ["bash"]
--
GitLab