From d90fbcbb5fa0f8f30e7fbe2722b1012e34aa2b18 Mon Sep 17 00:00:00 2001 From: gerblesh <101901964+gerblesh@users.noreply.github.com> Date: Wed, 7 Feb 2024 17:51:53 -0800 Subject: [PATCH] fix: remove deprecated bling `COPY` for `files` and `rpms` (#52) https://github.com/ublue-os/bling/blob/main/Containerfile the containerfile copies an empty folder in these locations for backwards compatability. `/tmp/files` and `/tmp/rpms` have been deprecated from bling, all of the RPMs have mostly moved to COPR or ublue-os/config Co-authored-by: Gerald Pinder --- templates/Containerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/templates/Containerfile b/templates/Containerfile index 01ba33c..d19aeb3 100644 --- a/templates/Containerfile +++ b/templates/Containerfile @@ -19,10 +19,6 @@ ARG IMAGE_REGISTRY=localhost COPY cosign.pub /usr/share/ublue-os/cosign.pub {%- endif %} -# Copy the bling from ublue-os/bling into tmp, to be installed later by the bling module -# Feel free to remove these lines if you want to speed up image builds and don't want any bling -COPY --from=ghcr.io/ublue-os/bling:latest /rpms /tmp/bling/rpms -COPY --from=ghcr.io/ublue-os/bling:latest /files /tmp/bling/files COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq COPY --from=gcr.io/projectsigstore/cosign /ko-app/cosign /usr/bin/cosign