scottk/secureblue
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/secureblue.git synced 2025-11-08 06:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add recipe build arg (#23)

Browse Source 
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:
bpbeatty
2023-04-06 09:04:53 -05:00
committed by GitHub
parent 6f095f8bfa
commit a27e3cfa13
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build.yml vendored
View File

@@ -108,6 +108,7 @@ jobs:
build-args: | build-args: |
FEDORA_MAJOR_VERSION=${{ env.FEDORA_MAJOR_VERSION }} FEDORA_MAJOR_VERSION=${{ env.FEDORA_MAJOR_VERSION }}
BASE_CONTAINER_URL=${{ env.BASE_CONTAINER_URL }} BASE_CONTAINER_URL=${{ env.BASE_CONTAINER_URL }}
RECIPE=${{ matrix.recipe }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
oci: false oci: false

3
Containerfile
View File

@@ -1,5 +1,6 @@
ARG FEDORA_MAJOR_VERSION=37 ARG FEDORA_MAJOR_VERSION=37
ARG BASE_CONTAINER_URL=ghcr.io/ublue-os/silverblue-main ARG BASE_CONTAINER_URL=ghcr.io/ublue-os/silverblue-main
ARG RECIPE
FROM ${BASE_CONTAINER_URL}:${FEDORA_MAJOR_VERSION} FROM ${BASE_CONTAINER_URL}:${FEDORA_MAJOR_VERSION}
@@ -7,7 +8,7 @@ FROM ${BASE_CONTAINER_URL}:${FEDORA_MAJOR_VERSION}
COPY etc /etc COPY etc /etc
# COPY usr /usr # 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 # 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 # copied from the official container image as it's not avaible as an rpm