mirror of
https://github.com/optim-enterprises-bv/secureblue.git
synced 2025-11-08 22:33:40 +00:00
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.
This commit is contained in:
1
.github/workflows/build.yml
vendored
1
.github/workflows/build.yml
vendored
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user