From 1700c2dfd38c508526a6ed45245f46c60fcaa751 Mon Sep 17 00:00:00 2001 From: Ethan Paul Date: Fri, 20 Dec 2024 15:03:29 -0500 Subject: [PATCH] Remove cruft and fix build args in containerfile --- Containerfile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Containerfile b/Containerfile index b82da1b..be403b0 100644 --- a/Containerfile +++ b/Containerfile @@ -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