diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 86b5471ce7..094a1e2f5b 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 34be3fd516..beb54b755f 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