From 8ecd409eab14d5dfcc723082839071c93befcd83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sat, 12 Aug 2023 20:48:59 +0200 Subject: [PATCH 01/20] adfsg --- .github/workflows/build.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a0eeafa68a..4ab5bf4beda 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,11 +22,16 @@ jobs: image_flavor: [main, nvidia] base_name: [bluefin, bluefin-dx, bluefin-framework, bluefin-dx-framework] major_version: [38] + nvidia_version: [535, 470] exclude: - base_name: bluefin-dx-framework image_flavor: nvidia - base_name: bluefin-framework image_flavor: nvidia + - image_flavor: main + nvidia_version: 535 + - image_flavor: main + nvidia_version: 470 include: - base_name: bluefin-framework target_base: bluefin @@ -37,6 +42,11 @@ jobs: - major_version: 38 is_latest_version: true is_stable_version: true + - image_flavor: nvidia + major_version: 38 + nvidia_version: 535 + is_latest_nvidia_version: true + steps: # Checkout push-to-registry action GitHub repository - name: Checkout Push to Registry action From 758da225f3d4dd0bf257271cdc19e37e6d34270c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sat, 12 Aug 2023 20:55:51 +0200 Subject: [PATCH 02/20] asf --- .github/workflows/build.yml | 86 ++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ab5bf4beda..946b9a72568 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ env: jobs: push-ghcr: name: Build and push image - runs-on: buildjet-2vcpu-ubuntu-2204 + runs-on: ubuntu-latest permissions: contents: read packages: write @@ -166,46 +166,46 @@ jobs: with: string: ${{ env.IMAGE_REGISTRY }} - # Push the image to GHCR (Image Registry) - - name: Push To GHCR - uses: redhat-actions/push-to-registry@v2 - id: push - if: github.event_name != 'pull_request' - env: - REGISTRY_USER: ${{ github.actor }} - REGISTRY_PASSWORD: ${{ github.token }} - with: - image: ${{ steps.build_image.outputs.image }} - tags: ${{ steps.build_image.outputs.tags }} - registry: ${{ steps.registry_case.outputs.lowercase }} - username: ${{ env.REGISTRY_USER }} - password: ${{ env.REGISTRY_PASSWORD }} - extra-args: | - --disable-content-trust - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - if: github.event_name != 'pull_request' - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - # Sign container - - uses: sigstore/cosign-installer@v3.1.1 - if: github.event_name != 'pull_request' - - - name: Sign container image - if: github.event_name != 'pull_request' - run: | - cosign sign -y --key env://COSIGN_PRIVATE_KEY ${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}@${TAGS} - env: - TAGS: ${{ steps.push.outputs.digest }} - COSIGN_EXPERIMENTAL: false - COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }} - - - name: Echo outputs - if: github.event_name != 'pull_request' - run: | - echo "${{ toJSON(steps.push.outputs) }}" + # # Push the image to GHCR (Image Registry) + # - name: Push To GHCR + # uses: redhat-actions/push-to-registry@v2 + # id: push + # if: github.event_name != 'pull_request' + # env: + # REGISTRY_USER: ${{ github.actor }} + # REGISTRY_PASSWORD: ${{ github.token }} + # with: + # image: ${{ steps.build_image.outputs.image }} + # tags: ${{ steps.build_image.outputs.tags }} + # registry: ${{ steps.registry_case.outputs.lowercase }} + # username: ${{ env.REGISTRY_USER }} + # password: ${{ env.REGISTRY_PASSWORD }} + # extra-args: | + # --disable-content-trust + + # - name: Login to GitHub Container Registry + # uses: docker/login-action@v2 + # if: github.event_name != 'pull_request' + # with: + # registry: ghcr.io + # username: ${{ github.actor }} + # password: ${{ secrets.GITHUB_TOKEN }} + + # # Sign container + # - uses: sigstore/cosign-installer@v3.1.1 + # if: github.event_name != 'pull_request' + + # - name: Sign container image + # if: github.event_name != 'pull_request' + # run: | + # cosign sign -y --key env://COSIGN_PRIVATE_KEY ${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}@${TAGS} + # env: + # TAGS: ${{ steps.push.outputs.digest }} + # COSIGN_EXPERIMENTAL: false + # COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }} + + # - name: Echo outputs + # if: github.event_name != 'pull_request' + # run: | + # echo "${{ toJSON(steps.push.outputs) }}" From fe6dde924a4a28d3d0cd135caca478c1aa845111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sat, 12 Aug 2023 21:00:26 +0200 Subject: [PATCH 03/20] fdg --- .github/workflows/build.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 946b9a72568..bb26b8f45a3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,10 +80,18 @@ jobs: fi BUILD_TAGS=("${MAJOR_VERSION}" "${MAJOR_VERSION}-${TIMESTAMP}") + if [[ "${{ matrix.base_version }}" == "nvidia" ]]; then - if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \ - [[ "${{ matrix.is_stable_version }}" == "true" ]]; then - BUILD_TAGS+=("latest") + if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \ + [[ "${{ matrix.is_latest_nvidia_version }}" == "true" ]] && \ + [[ "${{ matrix.is_stable_version }}" == "true" ]]; then + BUILD_TAGS+=("latest") + fi + else + if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \ + [[ "${{ matrix.is_stable_version }}" == "true" ]]; then + BUILD_TAGS+=("latest") + fi fi if [[ "${{ github.event_name }}" == "pull_request" ]]; then From 1bee15cf0748c3939acf95df34a44363876b1219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sat, 12 Aug 2023 21:41:47 +0200 Subject: [PATCH 04/20] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bb26b8f45a3..9aa31dd1bad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,8 +42,8 @@ jobs: - major_version: 38 is_latest_version: true is_stable_version: true - - image_flavor: nvidia - major_version: 38 + - major_version: 38 + image_flavor: nvidia nvidia_version: 535 is_latest_nvidia_version: true From f97634e3d6d341099f7f0dad88094d88699f08dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sat, 12 Aug 2023 21:46:51 +0200 Subject: [PATCH 05/20] uhkj --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9aa31dd1bad..60fe3828693 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: matrix: image_flavor: [main, nvidia] base_name: [bluefin, bluefin-dx, bluefin-framework, bluefin-dx-framework] - major_version: [38] + major_version: [38, 37] nvidia_version: [535, 470] exclude: - base_name: bluefin-dx-framework @@ -35,8 +35,10 @@ jobs: include: - base_name: bluefin-framework target_base: bluefin + image_flavor: main target_name: framework - base_name: bluefin-dx-framework + image_flavor: main target_base: bluefin-dx target_name: framework - major_version: 38 From 9c632bc153d71f1343264a62648e1be32c757390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sat, 12 Aug 2023 21:48:34 +0200 Subject: [PATCH 06/20] jhk --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60fe3828693..7878db85773 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,10 +35,12 @@ jobs: include: - base_name: bluefin-framework target_base: bluefin + major_version: 38 image_flavor: main target_name: framework - base_name: bluefin-dx-framework image_flavor: main + major_version: 38 target_base: bluefin-dx target_name: framework - major_version: 38 From 7875087585ed6508b4eef02f4e2fa543bf169c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sat, 12 Aug 2023 21:48:59 +0200 Subject: [PATCH 07/20] huih --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7878db85773..0f8547ad695 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: matrix: image_flavor: [main, nvidia] base_name: [bluefin, bluefin-dx, bluefin-framework, bluefin-dx-framework] - major_version: [38, 37] + major_version: [38] nvidia_version: [535, 470] exclude: - base_name: bluefin-dx-framework From a8e3078859d26db574f06fbe19303ffe8323404d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sat, 12 Aug 2023 21:59:05 +0200 Subject: [PATCH 08/20] sdafg --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f8547ad695..bf76050824e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,6 +71,7 @@ jobs: # Generate a timestamp for creating an image version history TIMESTAMP="$(date +%Y%m%d)" MAJOR_VERSION="${{ matrix.major_version }}" + NVIDIA_VERSION="${{ matrix.nvidia_version }}" COMMIT_TAGS=() BUILD_TAGS=() # Have tags for tracking builds during pull request @@ -83,15 +84,16 @@ jobs: COMMIT_TAGS+=("${SHA_SHORT}") fi - BUILD_TAGS=("${MAJOR_VERSION}" "${MAJOR_VERSION}-${TIMESTAMP}") + if [[ "${{ matrix.base_version }}" == "nvidia" ]]; then - + BUILD_TAGS=("${MAJOR_VERSION}-${NVIDIA_VERSION}" "${MAJOR_VERSION}-${NVIDIA-VERISON}-${TIMESTAMP}") if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \ [[ "${{ matrix.is_latest_nvidia_version }}" == "true" ]] && \ [[ "${{ matrix.is_stable_version }}" == "true" ]]; then BUILD_TAGS+=("latest") fi else + BUILD_TAGS=("${MAJOR_VERSION}" "${MAJOR_VERSION}-${TIMESTAMP}") if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \ [[ "${{ matrix.is_stable_version }}" == "true" ]]; then BUILD_TAGS+=("latest") From 08995b9d4784b25f7fdcab0ed647f33392bf9cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sat, 12 Aug 2023 22:01:22 +0200 Subject: [PATCH 09/20] bv --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf76050824e..485fa57e7aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,8 +84,9 @@ jobs: COMMIT_TAGS+=("${SHA_SHORT}") fi - + echo ${{ matrix.base_version }} if [[ "${{ matrix.base_version }}" == "nvidia" ]]; then + echo "test" BUILD_TAGS=("${MAJOR_VERSION}-${NVIDIA_VERSION}" "${MAJOR_VERSION}-${NVIDIA-VERISON}-${TIMESTAMP}") if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \ [[ "${{ matrix.is_latest_nvidia_version }}" == "true" ]] && \ From 8127573b97e9a96bab7ea8134be5058d32e83f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sat, 12 Aug 2023 22:03:04 +0200 Subject: [PATCH 10/20] gfhgf --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 485fa57e7aa..3e2d7247eed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,8 +84,8 @@ jobs: COMMIT_TAGS+=("${SHA_SHORT}") fi - echo ${{ matrix.base_version }} - if [[ "${{ matrix.base_version }}" == "nvidia" ]]; then + echo ${{ matrix.image_flavor }} + if [[ "${{ matrix.image_flavor }}" == "nvidia" ]]; then echo "test" BUILD_TAGS=("${MAJOR_VERSION}-${NVIDIA_VERSION}" "${MAJOR_VERSION}-${NVIDIA-VERISON}-${TIMESTAMP}") if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \ From 79c41db203c977dd8082e26ed39ff2b2dfdcfa7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sat, 12 Aug 2023 22:04:05 +0200 Subject: [PATCH 11/20] sdfg --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e2d7247eed..973057d57a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,12 +35,12 @@ jobs: include: - base_name: bluefin-framework target_base: bluefin - major_version: 38 - image_flavor: main + # major_version: 38 + # image_flavor: main target_name: framework - base_name: bluefin-dx-framework - image_flavor: main - major_version: 38 + # image_flavor: main + # major_version: 38 target_base: bluefin-dx target_name: framework - major_version: 38 From 3543d2e2ad773d205795143c635b8531c50d9d99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sat, 12 Aug 2023 22:05:20 +0200 Subject: [PATCH 12/20] mnmn --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 973057d57a5..e29166e9cb8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -87,7 +87,7 @@ jobs: echo ${{ matrix.image_flavor }} if [[ "${{ matrix.image_flavor }}" == "nvidia" ]]; then echo "test" - BUILD_TAGS=("${MAJOR_VERSION}-${NVIDIA_VERSION}" "${MAJOR_VERSION}-${NVIDIA-VERISON}-${TIMESTAMP}") + BUILD_TAGS=("${MAJOR_VERSION}-${NVIDIA_VERSION}" "${MAJOR_VERSION}-${NVIDIA-VERSION}-${TIMESTAMP}") if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \ [[ "${{ matrix.is_latest_nvidia_version }}" == "true" ]] && \ [[ "${{ matrix.is_stable_version }}" == "true" ]]; then From 420649f19d6a07c4f7c6ef9919dff285fd1ccb0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sat, 12 Aug 2023 22:05:39 +0200 Subject: [PATCH 13/20] guk --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e29166e9cb8..37036be22ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,12 +35,12 @@ jobs: include: - base_name: bluefin-framework target_base: bluefin - # major_version: 38 - # image_flavor: main + major_version: 38 + image_flavor: main target_name: framework - base_name: bluefin-dx-framework - # image_flavor: main - # major_version: 38 + image_flavor: main + major_version: 38 target_base: bluefin-dx target_name: framework - major_version: 38 From 08b4cfe2cc5abd05b2b19e3b0c33b79ef9da2478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sat, 12 Aug 2023 22:06:31 +0200 Subject: [PATCH 14/20] hjkl --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 37036be22ac..9fd8c07b64d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -87,7 +87,7 @@ jobs: echo ${{ matrix.image_flavor }} if [[ "${{ matrix.image_flavor }}" == "nvidia" ]]; then echo "test" - BUILD_TAGS=("${MAJOR_VERSION}-${NVIDIA_VERSION}" "${MAJOR_VERSION}-${NVIDIA-VERSION}-${TIMESTAMP}") + BUILD_TAGS=("${MAJOR_VERSION}-${NVIDIA_VERSION}" "${MAJOR_VERSION}-${NVIDIA_VERSION}-${TIMESTAMP}") if [[ "${{ matrix.is_latest_version }}" == "true" ]] && \ [[ "${{ matrix.is_latest_nvidia_version }}" == "true" ]] && \ [[ "${{ matrix.is_stable_version }}" == "true" ]]; then From 03f4342b2bd6b91752cbe3a90ea508d65cba7c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sat, 12 Aug 2023 22:08:30 +0200 Subject: [PATCH 15/20] sdg --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9fd8c07b64d..c6421a4b492 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,6 +92,7 @@ jobs: [[ "${{ matrix.is_latest_nvidia_version }}" == "true" ]] && \ [[ "${{ matrix.is_stable_version }}" == "true" ]]; then BUILD_TAGS+=("latest") + BUILD_TAGS+=("${MAJOR_VERSION}") fi else BUILD_TAGS=("${MAJOR_VERSION}" "${MAJOR_VERSION}-${TIMESTAMP}") From d5456b4dda3a8885eaa2b857b64f615295cd3e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sun, 13 Aug 2023 00:20:15 +0200 Subject: [PATCH 16/20] fgfg --- .github/workflows/build.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c6421a4b492..6422b00c71d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -182,22 +182,22 @@ jobs: with: string: ${{ env.IMAGE_REGISTRY }} - # # Push the image to GHCR (Image Registry) - # - name: Push To GHCR - # uses: redhat-actions/push-to-registry@v2 - # id: push - # if: github.event_name != 'pull_request' - # env: - # REGISTRY_USER: ${{ github.actor }} - # REGISTRY_PASSWORD: ${{ github.token }} - # with: - # image: ${{ steps.build_image.outputs.image }} - # tags: ${{ steps.build_image.outputs.tags }} - # registry: ${{ steps.registry_case.outputs.lowercase }} - # username: ${{ env.REGISTRY_USER }} - # password: ${{ env.REGISTRY_PASSWORD }} - # extra-args: | - # --disable-content-trust + # Push the image to GHCR (Image Registry) + - name: Push To GHCR + uses: redhat-actions/push-to-registry@v2 + id: push + if: github.event_name != 'pull_request' + env: + REGISTRY_USER: ${{ github.actor }} + REGISTRY_PASSWORD: ${{ github.token }} + with: + image: ${{ steps.build_image.outputs.image }} + tags: ${{ steps.build_image.outputs.tags }} + registry: ${{ steps.registry_case.outputs.lowercase }} + username: ${{ env.REGISTRY_USER }} + password: ${{ env.REGISTRY_PASSWORD }} + extra-args: | + --disable-content-trust # - name: Login to GitHub Container Registry # uses: docker/login-action@v2 From c8b3eda5d10c8b4f4b0abf4390da4862e9f5e8b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sun, 13 Aug 2023 01:01:40 +0200 Subject: [PATCH 17/20] lets try this again --- .github/workflows/build.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6422b00c71d..4233b3e8e71 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -151,6 +151,16 @@ jobs: run: | sed -i 's/FROM bluefin AS bluefin-framework/FROM ${{ matrix.target_base }} AS ${{ matrix.base_name }}/' Containerfile + - name: Set base image tag to have nvidia version + id: base_tag + shell: bash + run: | + if [[ "${{ matrix.image_flavor }}" == "nvidia" ]]; then + echo "BASE_TAG=${{ matrix.major_version }}-${{ matrix.nvidia_version }}" >> $GITHUB_ENV + else + echo "base_tag=${{ matrix.major_version }}" >> $GITHUB_ENV + fi + # Build image using Buildah action - name: Build Image id: build_image @@ -164,7 +174,7 @@ jobs: build-args: | IMAGE_NAME=${{ env.IMAGE_NAME }} IMAGE_FLAVOR=${{ matrix.image_flavor }} - FEDORA_MAJOR_VERSION=${{ matrix.major_version }} + FEDORA_MAJOR_VERSION=${{ env.BASE_TAG }} TARGET_BASE=${{ matrix.target_base }} labels: ${{ steps.meta.outputs.labels }} oci: false From e78e2de4510a489921d7100c6c97b1520aaad041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sun, 13 Aug 2023 01:16:34 +0200 Subject: [PATCH 18/20] afg --- .github/workflows/build.yml | 6 +++--- Containerfile | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4233b3e8e71..158c0a7414c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -156,9 +156,9 @@ jobs: shell: bash run: | if [[ "${{ matrix.image_flavor }}" == "nvidia" ]]; then - echo "BASE_TAG=${{ matrix.major_version }}-${{ matrix.nvidia_version }}" >> $GITHUB_ENV + echo "BASE_TAG=-${{ matrix.nvidia_version }}" >> $GITHUB_ENV else - echo "base_tag=${{ matrix.major_version }}" >> $GITHUB_ENV + echo "NVIDIA_VERSION=" >> $GITHUB_ENV fi # Build image using Buildah action @@ -174,7 +174,7 @@ jobs: build-args: | IMAGE_NAME=${{ env.IMAGE_NAME }} IMAGE_FLAVOR=${{ matrix.image_flavor }} - FEDORA_MAJOR_VERSION=${{ env.BASE_TAG }} + FEDORA_MAJOR_VERSION=${{ matrix.major_version }} TARGET_BASE=${{ matrix.target_base }} labels: ${{ steps.meta.outputs.labels }} oci: false diff --git a/Containerfile b/Containerfile index 8fe955a05c1..21fd827b9aa 100644 --- a/Containerfile +++ b/Containerfile @@ -4,8 +4,9 @@ ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$IMAGE_FLAVOR}" ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-37}" ARG TARGET_BASE="${TARGET_BASE:-bluefin}" +ARG NVIDIA_VERSION="${NVIDIA_VERSION}" -FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bluefin +FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION}${NVIDIA_VERSION} AS bluefin ARG IMAGE_NAME="${IMAGE_NAME}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}" From e51df146549ffcd2ae484f872e4d632a94cbda61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sun, 13 Aug 2023 01:20:59 +0200 Subject: [PATCH 19/20] asd --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 158c0a7414c..794518e430f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -156,7 +156,7 @@ jobs: shell: bash run: | if [[ "${{ matrix.image_flavor }}" == "nvidia" ]]; then - echo "BASE_TAG=-${{ matrix.nvidia_version }}" >> $GITHUB_ENV + echo "NVIDIA_VERSION=-${{ matrix.nvidia_version }}" >> $GITHUB_ENV else echo "NVIDIA_VERSION=" >> $GITHUB_ENV fi From 0c9ae5ed17f9ffe41b8d4371bbafb55a6ada7121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Primo=C5=BE=20Ajdi=C5=A1ek?= Date: Sun, 13 Aug 2023 01:48:13 +0200 Subject: [PATCH 20/20] aergfv --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 794518e430f..9058dfb0a4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -176,6 +176,7 @@ jobs: IMAGE_FLAVOR=${{ matrix.image_flavor }} FEDORA_MAJOR_VERSION=${{ matrix.major_version }} TARGET_BASE=${{ matrix.target_base }} + NVIDIA_VERSION=${{ env.NVIDIA_VERSION}} labels: ${{ steps.meta.outputs.labels }} oci: false # TODO(GH-280)