diff options
| author | Joseph Hunkeler <jhunkeler@users.noreply.github.com> | 2024-08-08 12:45:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-08 12:45:05 -0400 |
| commit | c9579598c5a1b49f7fe8e353623175bf8f3cc236 (patch) | |
| tree | cf7ef75a4bea7b16713a172d17b82a0c1ad9904b /mission | |
| parent | 99edcf7b998a1ac83b75ef3cc117c5b91c874782 (diff) | |
| download | stasis-c9579598c5a1b49f7fe8e353623175bf8f3cc236.tar.gz | |
Return of the INI refactor (#20)
* Continuation of #19
* Fixes always_update_base_environment override bug added by PR #19
* Finish type hinting implementation
* ini_getval_* functions now able to affect rendering mode using INI_READ_RAW and INI_READ_RENDER
* Created pointers to deeply nested structures to increase readability
* Output from ini_write() is more consistent, with fewer errant spaces and line feeds
* Fixes accidental regression in #19. INIVAL_TYPE_STR_ARRAY never produced an array of pointers to char. This needs to be corrected in the future. i.e. It has always generated a new-line delimited string, not a StrList, or array.
* Fix strlist_append_tokenize
* original pointer is no longer modified
* token strings are stripped of leading space before appending to the list
* Use defines instead of magic numbers
* delivery_init: add render_mode argument
* test_conda: Add render mode
* test_ini: Add render mode
* Only add conda packages and wheels to the image
* docker images are saved to the packages directory and will be consumed by the image if present.
* Render template variables after bootstrapping the delivery
Diffstat (limited to 'mission')
| -rw-r--r-- | mission/generic/Dockerfile.in | 2 | ||||
| -rw-r--r-- | mission/hst/Dockerfile.in | 2 | ||||
| -rw-r--r-- | mission/jwst/Dockerfile.in | 2 | ||||
| -rw-r--r-- | mission/roman/Dockerfile.in | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mission/generic/Dockerfile.in b/mission/generic/Dockerfile.in index c3c826a..2b3827c 100644 --- a/mission/generic/Dockerfile.in +++ b/mission/generic/Dockerfile.in @@ -61,7 +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} ${HOME}/packages +ADD ${SNAPSHOT_PKGDIR}/conda ${SNAPSHOT_PKGDIR}/wheels ${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 c3c826a..2b3827c 100644 --- a/mission/hst/Dockerfile.in +++ b/mission/hst/Dockerfile.in @@ -61,7 +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} ${HOME}/packages +ADD ${SNAPSHOT_PKGDIR}/conda ${SNAPSHOT_PKGDIR}/wheels ${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 c3c826a..2b3827c 100644 --- a/mission/jwst/Dockerfile.in +++ b/mission/jwst/Dockerfile.in @@ -61,7 +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} ${HOME}/packages +ADD ${SNAPSHOT_PKGDIR}/conda ${SNAPSHOT_PKGDIR}/wheels ${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 c3c826a..2b3827c 100644 --- a/mission/roman/Dockerfile.in +++ b/mission/roman/Dockerfile.in @@ -61,7 +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} ${HOME}/packages +ADD ${SNAPSHOT_PKGDIR}/conda ${SNAPSHOT_PKGDIR}/wheels ${HOME}/packages RUN chown -R developer: ${HOME} USER developer RUN conda config --set auto_update_conda false \ |