From a27e3cfa13fbf76e145a6fcd4bb469d42daf5995 Mon Sep 17 00:00:00 2001
From: bpbeatty <75324077+bpbeatty@users.noreply.github.com>
Date: Thu, 6 Apr 2023 09:04:53 -0500
Subject: [PATCH] fix: add recipe build arg (#23)

startingpoint has been updated to use multiple recipes. currently
this process is broken as the default recipe is always used. this
fixes this by adding a build arg to the containerfile and github
workflow build.
---
 .github/workflows/build.yml | 1 +
 Containerfile               | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 86b5471..094a1e2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -108,6 +108,7 @@ jobs:
           build-args: |
             FEDORA_MAJOR_VERSION=${{ env.FEDORA_MAJOR_VERSION }}
             BASE_CONTAINER_URL=${{ env.BASE_CONTAINER_URL }}
+            RECIPE=${{ matrix.recipe }}
           labels: ${{ steps.meta.outputs.labels }}
           oci: false
 
diff --git a/Containerfile b/Containerfile
index 34be3fd..beb54b7 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,5 +1,6 @@
 ARG FEDORA_MAJOR_VERSION=37
 ARG BASE_CONTAINER_URL=ghcr.io/ublue-os/silverblue-main
+ARG RECIPE
 
 FROM ${BASE_CONTAINER_URL}:${FEDORA_MAJOR_VERSION}
 
@@ -7,7 +8,7 @@ FROM ${BASE_CONTAINER_URL}:${FEDORA_MAJOR_VERSION}
 COPY etc /etc
 # COPY usr /usr
 
-COPY recipe.yml /tmp/ublue-recipe.yml
+COPY ${RECIPE} /tmp/ublue-recipe.yml
 
 # yq used in build.sh and the setup-flatpaks recipe to read the recipe.yml
 # copied from the official container image as it's not avaible as an rpm