diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-08-17 02:04:29 -0400 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-08-17 02:04:29 -0400 |
| commit | 56d706c41cf08e6bcf99d19074eded218f640c5b (patch) | |
| tree | 42da0ad9aa87829cdedcd0b1173594c82c208388 | |
| parent | c069d0da7645eb1e596a53178960149224af8d48 (diff) | |
| download | stasis-undo-dockerfile-add-separation.tar.gz | |
Undo changes made to Dockerfile.inundo-dockerfile-add-separation
* The packages directory is copied to the build/docker directory.
* There is no need to separate these ADD calls.
| -rw-r--r-- | mission/generic/Dockerfile.in | 3 | ||||
| -rw-r--r-- | mission/hst/Dockerfile.in | 3 | ||||
| -rw-r--r-- | mission/jwst/Dockerfile.in | 3 | ||||
| -rw-r--r-- | mission/roman/Dockerfile.in | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/mission/generic/Dockerfile.in b/mission/generic/Dockerfile.in index 360fee6..c3c826a 100644 --- a/mission/generic/Dockerfile.in +++ b/mission/generic/Dockerfile.in @@ -61,8 +61,7 @@ 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 ${HOME}/packages/conda -ADD ${SNAPSHOT_PKGDIR}/wheels ${HOME}/packages/wheels +ADD ${SNAPSHOT_PKGDIR} ${HOME}/packages 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 360fee6..c3c826a 100644 --- a/mission/hst/Dockerfile.in +++ b/mission/hst/Dockerfile.in @@ -61,8 +61,7 @@ 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 ${HOME}/packages/conda -ADD ${SNAPSHOT_PKGDIR}/wheels ${HOME}/packages/wheels +ADD ${SNAPSHOT_PKGDIR} ${HOME}/packages 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 360fee6..c3c826a 100644 --- a/mission/jwst/Dockerfile.in +++ b/mission/jwst/Dockerfile.in @@ -61,8 +61,7 @@ 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 ${HOME}/packages/conda -ADD ${SNAPSHOT_PKGDIR}/wheels ${HOME}/packages/wheels +ADD ${SNAPSHOT_PKGDIR} ${HOME}/packages 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 360fee6..c3c826a 100644 --- a/mission/roman/Dockerfile.in +++ b/mission/roman/Dockerfile.in @@ -61,8 +61,7 @@ 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 ${HOME}/packages/conda -ADD ${SNAPSHOT_PKGDIR}/wheels ${HOME}/packages/wheels +ADD ${SNAPSHOT_PKGDIR} ${HOME}/packages RUN chown -R developer: ${HOME} USER developer RUN conda config --set auto_update_conda false \ |