Remove cruft and fix build args in containerfile

2024-12-20 15:03:29 -05:00
parent 5535baa6bc
commit 1700c2dfd3
1 changed files with 6 additions and 8 deletions
--- a/14
+++ b/14
@@ -1,16 +1,14 @@
-ARG FEDORA_VERSION
+ARG BASE_IMAGE
+ARG BASE_IMAGE_VERSION

-FROM registry.fedoraproject.org/fedora-toolbox:${FEDORA_VERSION}
+FROM ${BASE_IMAGE}:${BASE_IMAGE_VERSION}

 ARG BUILD_NONCE
+ARG ENV_NAME

-ENV TOOLBOX_ENV=base
+ENV TOOLBOX_ENV=${ENV_NAME}

-LABEL local.voyager.base.nonce=${BUILD_NONCE}
+LABEL local.${ENV_NAME}.nonce=${BUILD_NONCE}

 ADD load-user-bashrc.sh /etc/profile.d/99-load-user-bashrc.sh 

-RUN dnf install --assumeyes \
-  powerline \
-  make \
-  nano