diff --git a/elements/rocky-minimal-yum/environment.d/10-rocky-container-type.bash b/elements/rocky-minimal-yum/environment.d/10-rocky-container-type.bash index 8293363..322b87d 100644 --- a/elements/rocky-minimal-yum/environment.d/10-rocky-container-type.bash +++ b/elements/rocky-minimal-yum/environment.d/10-rocky-container-type.bash @@ -1 +1 @@ -export DIB_YUM_ROCKY_CONTAINER_TYPE="${DIB_YUM_ROCKY_CONTAINER:-'Base'}" +export DIB_YUM_ROCKY_CONTAINER_TYPE="${DIB_YUM_ROCKY_CONTAINER_TYPE:-'Base'}" diff --git a/elements/rocky-minimal-yum/package-installs.yaml b/elements/rocky-minimal-yum/package-installs.yaml index 07aaae0..8298612 100644 --- a/elements/rocky-minimal-yum/package-installs.yaml +++ b/elements/rocky-minimal-yum/package-installs.yaml @@ -1,39 +1,39 @@ bash: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal binutils: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal coreutils-single: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal crypto-policies-scripts: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal curl-minimal: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal findutils: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal glibc-minimal-langpack: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal gzip: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal hostname: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal less: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal libcurl-minimal: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal libusbx: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal lsb_release: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal rootfiles: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal tar: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal usermode: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal systemd-libs: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal vim-minimal: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal yum: - when: DIB_YUM_ROCKY_CONTAINER_TYPE!='Minimal' + when: DIB_YUM_ROCKY_CONTAINER_TYPE!=Minimal diff --git a/elements/rocky-minimal-yum/post-install.d/99-cleanup-container b/elements/rocky-minimal-yum/post-install.d/99-cleanup-container index 8ae965c..7b79ef8 100755 --- a/elements/rocky-minimal-yum/post-install.d/99-cleanup-container +++ b/elements/rocky-minimal-yum/post-install.d/99-cleanup-container @@ -11,6 +11,6 @@ ${YUM} clean all ${YUM} -y remove sudo -if [[ $DIB_YUM_ROCKY_CONTAINER_TYPE =~ (Base|Minimal) ]]; then +if [[ $DIB_YUM_ROCKY_CONTAINER_TYPE =~ (Minimal) ]]; then ${YUM} -y remove python3 python-unversioned-command python3-pyyaml expat python3-libs python3-setuptools-wheel python3-pip-wheel fi