From c5020895d2e20e4de4fa42fc7505dec196cabebf Mon Sep 17 00:00:00 2001
From: gerblesh <101901964+gerblesh@users.noreply.github.com>
Date: Fri, 21 Jul 2023 09:11:18 -0700
Subject: [PATCH] modify build.sh and containerfile to be in line with PR

---
 Containerfile    | 9 ++++++---
 scripts/build.sh | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Containerfile b/Containerfile
index 8527893117..4270f09cbc 100644
--- a/Containerfile
+++ b/Containerfile
@@ -14,6 +14,7 @@ FROM ${BASE_IMAGE_URL}:${FEDORA_MAJOR_VERSION}
 # The default recipe set to the recipe's default filename
 # so that `podman build` should just work for many people.
 ARG RECIPE=./recipe.yml
+
 # The default image registry to write to policy.json and cosign.yaml
 ARG IMAGE_REGISTRY=ghcr.io/ublue-os
 
@@ -26,12 +27,14 @@ ARG IMAGE_REGISTRY=ghcr.io/ublue-os
 # See issue #28 (https://github.com/ublue-os/startingpoint/issues/28).
 COPY usr /usr
 
+# Copy public key
+COPY cosign.pub /usr/etc/pki/containers/cosign.pub
+# Copy base signing config
+COPY usr/etc/containers /usr/etc/
+
 # Copy the recipe that we're building.
 COPY ${RECIPE} /usr/share/ublue-os/recipe.yml
 
-COPY ./cosign.pub /usr/etc/pki/containers/cosign.pub
-COPY ./usr/etc/containers /usr/etc/
-
 # Copy nix install script and Universal Blue wallpapers RPM from Bling image
 #COPY --from=ghcr.io/ublue-os/bling:latest /rpms/ublue-os-wallpapers-0.1-1.fc38.noarch.rpm /tmp/ublue-os-wallpapers-0.1-1.fc38.noarch.rpm
 
diff --git a/scripts/build.sh b/scripts/build.sh
index 6795ae65b3..b6d5ac6622 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -24,6 +24,7 @@ echo "Building custom Fedora ${FEDORA_VERSION} from image: \"${BASE_IMAGE}\"."
 
 # Setup container signing
 echo "Setup container signing in policy.json and cosign.yaml"
+echo "Registry to write: $IMAGE_REGISTRY"
 sed -i "s ghcr.io/ublue-os $IMAGE_REGISTRY g" /usr/etc/containers/policy.json
 sed -i "s ghcr.io/ublue-os $IMAGE_REGISTRY g" /usr/etc/containers/registries.d/cosign.yaml