stuff

ublue-os · Feb 25, 2024 · 6a7e9ef · 6a7e9ef
1 parent 1e471f4
commit 6a7e9ef
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 33 deletions.
diff --git a/.github/workflows/push_images.yml b/.github/workflows/push_images.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         arch: [amd64] #add ,arm64 to add back arm build
         version: [39, 40]
-        image_name: [fedora-cosmic-atomic, fedora-cosmic-atomic-silverblue]
+        image_name: [fedora-cosmic-atomic, fedora-cosmic-atomic-silverblue, fedora-cosmic-atomic-nvidia]
     steps:
       - name: Maximize build space
         uses: easimon/maximize-build-space@v10
@@ -43,9 +43,9 @@ jobs:
           images: |
             ${{ matrix.image_name }}
           labels: |
-            org.opencontainers.image.title= ${{ matrix.image_name }}
-            org.opencontainers.image.version= ${{ matrix.version }}
-            org.opencontainers.image.description= ${{ env.description }}
+            org.opencontainers.image.title=${{ matrix.image_name }}
+            org.opencontainers.image.version=${{ matrix.version }}
+            org.opencontainers.image.description=${{ env.description }}
             io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ryanabx/fedora-cosmic-atomic/main/README.md
             io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/56272643?s=200&v=4
 
@@ -60,12 +60,12 @@ jobs:
         uses: redhat-actions/buildah-build@v2
         with:
           containerfiles: |
-            ./containers/Containerfile.${{ matrix.image_name }}.${{ matrix.version }}
+            ./containers/Containerfile.${{ matrix.image_name }}
           image: ${{ matrix.image_name }}
-          archs: ${{ env.arch_type }}
+          archs: ${{ matrix.arch }}
           build-args: |
-            IMAGE_MAJOR_VERSION= ${{ matrix.version }}
-            IMAGE_REGISTRY= ${{ env.image_registry }}
+            IMAGE_MAJOR_VERSION=${{ matrix.version }}
+            IMAGE_REGISTRY=${{ env.image_registry }}
           oci: false
 
       - name: 'Login to GitHub Container Registry'

diff --git a/...ers/Containerfile.fedora-cosmic-atomic.39 → ...ainers/Containerfile.fedora-cosmic-atomic b/...ers/Containerfile.fedora-cosmic-atomic.39 → ...ainers/Containerfile.fedora-cosmic-atomic
diff --git a/...erfile.fedora-cosmic-atomic-silverblue.40 → ...Containerfile.fedora-cosmic-atomic-nvidia b/...erfile.fedora-cosmic-atomic-silverblue.40 → ...Containerfile.fedora-cosmic-atomic-nvidia
@@ -1,5 +1,5 @@
-ARG IMAGE_MAJOR_VERSION=40
-ARG BASE_IMAGE_URL=quay.io/fedora/fedora-silverblue
+ARG IMAGE_MAJOR_VERSION=39
+ARG BASE_IMAGE_URL=ghcr.io/ublue-os/base-nvidia
 
 FROM ghcr.io/ryanabx/cosmic-artifacts:latest as cosmic-compiled
 

diff --git a/...erfile.fedora-cosmic-atomic-silverblue.39 → ...ainerfile.fedora-cosmic-atomic-silverblue b/...erfile.fedora-cosmic-atomic-silverblue.39 → ...ainerfile.fedora-cosmic-atomic-silverblue
diff --git a/containers/Containerfile.fedora-cosmic-atomic.40 b/containers/Containerfile.fedora-cosmic-atomic.40