From c9579598c5a1b49f7fe8e353623175bf8f3cc236 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 8 Aug 2024 12:45:05 -0400 Subject: 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 --- mission/generic/Dockerfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mission/generic') 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 \ -- cgit