Skip to content
Snippets Groups Projects
Commit b2136d4f authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

Fixed docker entrypoint so it plays nicely with CI

parent 5d182009
No related branches found
No related tags found
1 merge request!2Release version for v2.0.0 container
...@@ -52,5 +52,8 @@ RUN cd /opt/spack-environment && \ ...@@ -52,5 +52,8 @@ RUN cd /opt/spack-environment && \
spack env activate --sh -d . >> /etc/profile.d/z10_spack_environment.sh && \ 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 echo "export BINARY_TAG=x86_64-linux-gcc9-opt" >> /etc/profile.d/z10_spack_environment.sh
ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l", "-c"] ## make sure we have the entrypoints setup correctly
CMD ["bash"] ENTRYPOINT []
CMD ["bash", "--rcfile", "/etc/profile", "-l"]
USER 0
WORKDIR /
...@@ -24,7 +24,11 @@ COPY --from=builder /opt/spack-environment /opt/spack-environment ...@@ -24,7 +24,11 @@ COPY --from=builder /opt/spack-environment /opt/spack-environment
COPY --from=builder /opt/software /opt/software COPY --from=builder /opt/software /opt/software
COPY --from=builder /opt/view /opt/view 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 /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 COPY --from=builder /root/.bashrc /etc/bash.bashrc
ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l", "-c"] ## make sure we have the entrypoints setup correctly
CMD ["bash"] ENTRYPOINT []
CMD ["bash", "--rcfile", "/etc/profile", "-l"]
USER 0
WORKDIR /
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment