Merge pull request #33 from bobslept/bluefin-main

[pull] main from bluefin-main

.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
   push:
     branches:
       - main
@@ -31,23 +31,15 @@ jobs:
       matrix:
         image_flavor: [main]
         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: 
+        major_version: [38, 39]
+        include:
+          - major_version: 38
+            is_latest_version: true
+            is_stable_version: true
+          - major_version: 39
+            is_latest_version: true
+            is_stable_version: false
+    steps:
       # Checkout push-to-registry action GitHub repository
       - name: Checkout Push to Registry action
         uses: actions/checkout@v4
@@ -100,10 +92,10 @@ 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
 
@@ -121,20 +113,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
@@ -207,4 +185,3 @@ jobs:
         if: github.event_name != 'pull_request'
         run: |
           echo "${{ toJSON(steps.push.outputs) }}"
-

Containerfile

@@ -16,10 +16,12 @@ COPY etc/yum.repos.d/ /etc/yum.repos.d/
 COPY packages.json /tmp/packages.json
 COPY build.sh /tmp/build.sh
 
-# gnome-vrr
-RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo
-RUN rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem xorg-x11-server-Xwayland
-RUN rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo
+# Exclude gnome-vrr from F39
+RUN if grep -qv "39" <<< "${FEDORA_MAJOR_VERSION}"; then \
+    wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \
+    rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem xorg-x11-server-Xwayland && \
+    rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo \
+    ; fi
 
 ## bootc
 RUN wget https://copr.fedorainfracloud.org/coprs/rhcontainerbot/bootc/repo/fedora-"${FEDORA_MAJOR_VERSION}"/bootc-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/bootc.repo
@@ -108,22 +110,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

dx/etc/yum.repos.d/docker-ce.repo

@@ -1,6 +1,6 @@
 [docker-ce-stable]
 name=Docker CE Stable - $basearch
-baseurl=https://download.docker.com/linux/fedora/$releasever/$basearch/stable
+baseurl=https://download.docker.com/linux/fedora/38/$basearch/stable
 enabled=1
 gpgcheck=1
 gpgkey=https://download.docker.com/linux/fedora/gpg