Merge pull request #16 from ublue-os/main

[pull] main from ublue-os:main

.github/workflows/build-fedora-toolbox.yml

@@ -27,7 +27,7 @@ jobs:
 
       # Build metadata
       - name: Image Metadata
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         id: meta
         with:
           images: |
@@ -73,7 +73,7 @@ jobs:
             --disable-content-trust
             
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io

.github/workflows/build-ubuntu-toolbox.yml

@@ -27,7 +27,7 @@ jobs:
 
       # Build metadata
       - name: Image Metadata
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         id: meta
         with:
           images: |
@@ -73,7 +73,7 @@ jobs:
             --disable-content-trust
             
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io

.github/workflows/build-wolfi-toolbox.yml

@@ -27,7 +27,7 @@ jobs:
 
       # Build metadata
       - name: Image Metadata
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         id: meta
         with:
           images: |
@@ -73,7 +73,7 @@ jobs:
             --disable-content-trust
             
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io

.github/workflows/build.yml

@@ -1,7 +1,7 @@
 name: Build and Push Image
 on:
   schedule:
-    - cron: '00 10 * * *'  # 10:00am everyday
+    - cron: '00 08 * * *'  # 8:00am everyday
   merge_group:
   pull_request:
   workflow_dispatch:
@@ -20,24 +20,13 @@ jobs:
       fail-fast: false
       matrix:
         image_flavor: [main, nvidia]
-        base_name: [bluefin, bluefin-dx, bluefin-framework, bluefin-dx-framework]
+        base_name: [bluefin, bluefin-dx]
         major_version: [38]
-        exclude:
-          - base_name: bluefin-dx-framework
-            image_flavor: nvidia
-          - base_name: bluefin-framework
-            image_flavor: nvidia
         include:
-          - base_name: bluefin-framework
-            target_base: bluefin
-            target_name: framework
-          - base_name: bluefin-dx-framework
-            target_base: bluefin-dx
-            target_name: framework
           - major_version: 38
             is_latest_version: true
             is_stable_version: true
-    steps: 
+    steps:
       # Checkout push-to-registry action GitHub repository
       - name: Checkout Push to Registry action
         uses: actions/checkout@v4
@@ -90,16 +79,16 @@ jobs:
               echo "${TAG}"
           done
           echo "alias_tags=${alias_tags[*]}" >> $GITHUB_OUTPUT
-          
+
       - name: Get Current Fedora Version
         id: labels
-        run: |  
+        run: |
           ver=$(skopeo inspect docker://ghcr.io/ublue-os/silverblue-${{ matrix.image_flavor }}:${{ matrix.major_version }} | jq -r '.Labels["org.opencontainers.image.version"]')
           echo "VERSION=$ver" >> $GITHUB_OUTPUT
 
       # Build metadata
       - name: Image Metadata
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         id: meta
         with:
           images: |
@@ -111,20 +100,6 @@ jobs:
             io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/bluefin/bluefin/README.md
             io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4
 
-      # Update FROM lines for variants that have their own matrix via SED
-      # This is due to limitations in buildah using interpreted values as registry
-      # images and not image targets in file:
-      #   `FROM ${TARGET_BASE} as framework`
-      # evalutates to `FROM bluefin as framework` but buildah then looks for quay.io/bluefin
-      # vs the existing containerfile target.
-      # TODO(GH-280): Find an alternative for this rather than using sed.
-      - name: Build Image
-        id: sed_workaround
-        if: matrix.target_base
-        shell: bash
-        run: |
-          sed -i 's/FROM bluefin AS bluefin-framework/FROM ${{ matrix.target_base }} AS ${{ matrix.base_name }}/' Containerfile
-
       # Build image using Buildah action
       - name: Build Image
         id: build_image
@@ -173,7 +148,7 @@ jobs:
             --disable-content-trust
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io
@@ -197,4 +172,3 @@ jobs:
         if: github.event_name != 'pull_request'
         run: |
           echo "${{ toJSON(steps.push.outputs) }}"
-

Containerfile

@@ -108,22 +108,3 @@ RUN rm -f /etc/yum.repos.d/fedora-cisco-openh264.repo
 
 RUN rm -rf /tmp/* /var/*
 RUN ostree container commit
-
-# Image for Framework laptops
-FROM bluefin AS bluefin-framework
-
-ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
-ARG PACKAGE_LIST="bluefin-framework"
-
-COPY framework/usr /usr
-COPY packages.json /tmp/packages.json
-COPY build.sh /tmp/build.sh
-
-# Handle packages via packages.json
-RUN /tmp/build.sh
-
-RUN systemctl enable tlp
-RUN systemctl enable fprintd.service
-
-RUN rm -rf /tmp/* /var/*
-RUN ostree container commit