Skip to content
This repository has been archived by the owner on Nov 20, 2023. It is now read-only.

Commit

Permalink
fix: add recipe build arg (#23)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bpbeatty authored Apr 6, 2023
1 parent 6f095f8 commit a27e3cf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion Containerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
ARG FEDORA_MAJOR_VERSION=37
ARG BASE_CONTAINER_URL=ghcr.io/ublue-os/silverblue-main
ARG RECIPE

FROM ${BASE_CONTAINER_URL}:${FEDORA_MAJOR_VERSION}

# copy over configuration files
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
Expand Down

0 comments on commit a27e3cf

Please sign in to comment.