aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2024-08-08 23:08:11 -0400
committerJoseph Hunkeler <jhunkeler@gmail.com>2024-08-08 23:08:11 -0400
commitb02013d2d39c16013ab0362a355b4689a2869ed2 (patch)
treebd4b7aceac3d84f78637d0119f3659950cbfe6b6
parentc9b73913d4e4cc1eae2f54ba70c0d866a749e3af (diff)
downloadstasis-fix-docker-add.tar.gz
Fix Dockerfile ADDfix-docker-add
* Destination directories were not created properly * This ensures $HOME/packages/{conda,wheels} are created in the docker developer home directory
-rw-r--r--mission/generic/Dockerfile.in3
-rw-r--r--mission/hst/Dockerfile.in3
-rw-r--r--mission/jwst/Dockerfile.in3
-rw-r--r--mission/roman/Dockerfile.in3
4 files changed, 8 insertions, 4 deletions
diff --git a/mission/generic/Dockerfile.in b/mission/generic/Dockerfile.in
index 2b3827c..360fee6 100644
--- a/mission/generic/Dockerfile.in
+++ b/mission/generic/Dockerfile.in
@@ -61,7 +61,8 @@ RUN curl -q -OSsL ${DIST_URL}/${DIST_INSTALLER} \
ENV PATH="${DIST_PATH}/bin:${PATH}"
# Get delivery snapshot
ADD ${SNAPSHOT_INPUT} ${HOME}/SNAPSHOT.yml
-ADD ${SNAPSHOT_PKGDIR}/conda ${SNAPSHOT_PKGDIR}/wheels ${HOME}/packages
+ADD ${SNAPSHOT_PKGDIR}/conda ${HOME}/packages/conda
+ADD ${SNAPSHOT_PKGDIR}/wheels ${HOME}/packages/wheels
RUN chown -R developer: ${HOME}
USER developer
RUN conda config --set auto_update_conda false \
diff --git a/mission/hst/Dockerfile.in b/mission/hst/Dockerfile.in
index 2b3827c..360fee6 100644
--- a/mission/hst/Dockerfile.in
+++ b/mission/hst/Dockerfile.in
@@ -61,7 +61,8 @@ RUN curl -q -OSsL ${DIST_URL}/${DIST_INSTALLER} \
ENV PATH="${DIST_PATH}/bin:${PATH}"
# Get delivery snapshot
ADD ${SNAPSHOT_INPUT} ${HOME}/SNAPSHOT.yml
-ADD ${SNAPSHOT_PKGDIR}/conda ${SNAPSHOT_PKGDIR}/wheels ${HOME}/packages
+ADD ${SNAPSHOT_PKGDIR}/conda ${HOME}/packages/conda
+ADD ${SNAPSHOT_PKGDIR}/wheels ${HOME}/packages/wheels
RUN chown -R developer: ${HOME}
USER developer
RUN conda config --set auto_update_conda false \
diff --git a/mission/jwst/Dockerfile.in b/mission/jwst/Dockerfile.in
index 2b3827c..360fee6 100644
--- a/mission/jwst/Dockerfile.in
+++ b/mission/jwst/Dockerfile.in
@@ -61,7 +61,8 @@ RUN curl -q -OSsL ${DIST_URL}/${DIST_INSTALLER} \
ENV PATH="${DIST_PATH}/bin:${PATH}"
# Get delivery snapshot
ADD ${SNAPSHOT_INPUT} ${HOME}/SNAPSHOT.yml
-ADD ${SNAPSHOT_PKGDIR}/conda ${SNAPSHOT_PKGDIR}/wheels ${HOME}/packages
+ADD ${SNAPSHOT_PKGDIR}/conda ${HOME}/packages/conda
+ADD ${SNAPSHOT_PKGDIR}/wheels ${HOME}/packages/wheels
RUN chown -R developer: ${HOME}
USER developer
RUN conda config --set auto_update_conda false \
diff --git a/mission/roman/Dockerfile.in b/mission/roman/Dockerfile.in
index 2b3827c..360fee6 100644
--- a/mission/roman/Dockerfile.in
+++ b/mission/roman/Dockerfile.in
@@ -61,7 +61,8 @@ RUN curl -q -OSsL ${DIST_URL}/${DIST_INSTALLER} \
ENV PATH="${DIST_PATH}/bin:${PATH}"
# Get delivery snapshot
ADD ${SNAPSHOT_INPUT} ${HOME}/SNAPSHOT.yml
-ADD ${SNAPSHOT_PKGDIR}/conda ${SNAPSHOT_PKGDIR}/wheels ${HOME}/packages
+ADD ${SNAPSHOT_PKGDIR}/conda ${HOME}/packages/conda
+ADD ${SNAPSHOT_PKGDIR}/wheels ${HOME}/packages/wheels
RUN chown -R developer: ${HOME}
USER developer
RUN conda config --set auto_update_conda false \