From 19f6b3677b2a41d356ed124b2c3cfb6dceb82eb5 Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Thu, 12 Oct 2023 22:32:05 -0500 Subject: [PATCH 1/7] feat: enable ublue-nvctk-cdi.service by default (#162) We added this service to generate nvidia device definitions for container toolkit, but it isn't enabling by default like it should. This corrects that. --- post-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/post-install.sh b/post-install.sh index de36f7c..35544c3 100755 --- a/post-install.sh +++ b/post-install.sh @@ -4,6 +4,7 @@ set -ouex pipefail sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/{eyecantcu-supergfxctl,nvidia-container-toolkit}.repo +systemctl enable ublue-nvctk-cdi.service semodule --verbose --install /usr/share/selinux/packages/nvidia-container.pp ln -s /usr/bin/ld.bfd /etc/alternatives/ld ln -s /etc/alternatives/ld /usr/bin/ld From e5f62a3e1e8cca1a5b822865f27e6c12ac350490 Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Thu, 19 Oct 2023 14:35:24 -0400 Subject: [PATCH 2/7] feat: turn on F39 for vauxite (#164) --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0dbb55f..ba63a77 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,8 +55,6 @@ jobs: major_version: 37 - image_name: onyx major_version: 38 - - image_name: vauxite - major_version: 39 steps: - name: Maximize build space uses: ublue-os/remove-unwanted-software@v6 From c5e8860c6ffb75a71dd8ba35317a118bc08c6ae6 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Sat, 28 Oct 2023 22:49:15 -0600 Subject: [PATCH 3/7] chore(ci): Build at 7:30 AM UTC (#167) Main images complete and are published in under 20 minutes consistently allowing Nvidia to build closer to when main finishes --- .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 ba63a77..4e6543a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ on: pull_request: merge_group: schedule: - - cron: '0 8 * * *' # 8:00am everyday (1 hr delay after 'main' builds) + - cron: '30 7 * * *' # 7:30am everyday (30 min delay after 'main' builds) workflow_dispatch: env: IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} From d462e5d0c36dabcdbb52521b8c60e1682ec7b05c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 19:39:14 -0400 Subject: [PATCH 4/7] build(deps): bump ASzc/change-string-case-action from 5 to 6 (#168) Bumps [ASzc/change-string-case-action](https://github.com/aszc/change-string-case-action) from 5 to 6. - [Release notes](https://github.com/aszc/change-string-case-action/releases) - [Commits](https://github.com/aszc/change-string-case-action/compare/v5...v6) --- updated-dependencies: - dependency-name: ASzc/change-string-case-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .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 4e6543a..6c252d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -174,7 +174,7 @@ jobs: # https://github.com/macbre/push-to-ghcr/issues/12 - name: Lowercase Registry id: registry_case - uses: ASzc/change-string-case-action@v5 + uses: ASzc/change-string-case-action@v6 with: string: ${{ env.IMAGE_REGISTRY }} From 531799a3809892ce8dda119c85e3d522edd0772a Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Tue, 31 Oct 2023 21:51:31 -0600 Subject: [PATCH 5/7] chore(ci): Build at 3:30 PM UTC (#169) Move build schedule back for official images --- .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 6c252d6..dc7fc0f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ on: pull_request: merge_group: schedule: - - cron: '30 7 * * *' # 7:30am everyday (30 min delay after 'main' builds) + - cron: '30 15 * * *' # 15:30 UTC everyday (30 min delay after 'main' builds) workflow_dispatch: env: IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} From 545f70267d7f44c12683fa77035ffd0a4e239b36 Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Mon, 6 Nov 2023 10:41:59 -0600 Subject: [PATCH 6/7] chore: restore default rpmfusion mirror behavior (#170) --- install.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/install.sh b/install.sh index 34d1625..5415ba1 100755 --- a/install.sh +++ b/install.sh @@ -8,14 +8,6 @@ else sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo fi -# force use of single rpmfusion mirror -sed -i.bak 's%^metalink=%#metalink=%' /etc/yum.repos.d/rpmfusion-*.repo -sed -i 's%^#baseurl=http://download1.rpmfusion.org%baseurl=http://mirrors.ocf.berkeley.edu/rpmfusion%' /etc/yum.repos.d/rpmfusion-*.repo -# after F39 launches, bump to 40 -if [[ "${FEDORA_MAJOR_VERSION}" -ge 39 ]]; then - sed -i 's%free/fedora/releases%free/fedora/development%' /etc/yum.repos.d/rpmfusion-*.repo -fi - rpm-ostree install \ /tmp/akmods-rpms/ublue-os/ublue-os-nvidia-addons-*.rpm @@ -34,6 +26,3 @@ rpm-ostree install \ xorg-x11-drv-${NVIDIA_PACKAGE_NAME}-libs.i686 \ nvidia-container-toolkit nvidia-vaapi-driver supergfxctl ${VARIANT_PKGS} \ /tmp/akmods-rpms/kmods/kmod-${NVIDIA_PACKAGE_NAME}-${KERNEL_VERSION}-${NVIDIA_AKMOD_VERSION}.fc${RELEASE}.rpm - -# reset forced use of single rpmfusion mirror -rename -v .repo.bak .repo /etc/yum.repos.d/rpmfusion-*repo.bak From 76bc11f234ba9f6e9e979d9c888a43663df857bf Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Wed, 8 Nov 2023 06:16:49 -0700 Subject: [PATCH 7/7] feat: Mark Fedora 39 images as stable and roll out gts (#163) This will push Fedora 39 images to latest and set Fedora 38 as the gts release --- .github/workflows/build.yml | 4 ++-- Containerfile | 4 ++-- image-info.sh | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dc7fc0f..f30038a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,14 +36,14 @@ jobs: is_stable_version: true is_gts_driver: false - major_version: 38 - is_latest_version: true + is_latest_version: false is_stable_version: true is_gts_driver: true - driver_version: 535 is_latest_driver: true - major_version: 39 is_latest_version: true - is_stable_version: false + is_stable_version: true is_gts_version: false exclude: # There is no Fedora 37 version of sericea diff --git a/Containerfile b/Containerfile index ad5541a..4a3919f 100644 --- a/Containerfile +++ b/Containerfile @@ -1,13 +1,13 @@ ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" ARG BASE_IMAGE="ghcr.io/ublue-os/${IMAGE_NAME}-main" -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" +ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS nvidia ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" ARG IMAGE_VENDOR="ublue-os" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-nvidia}" -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" +ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" ARG NVIDIA_MAJOR_VERSION="${NVIDIA_MAJOR_VERSION:-535}" COPY image-info.sh /tmp/image-info.sh diff --git a/image-info.sh b/image-info.sh index c4c31da..96d3ba2 100755 --- a/image-info.sh +++ b/image-info.sh @@ -6,9 +6,12 @@ IMAGE_INFO="/usr/share/ublue-os/image-info.json" IMAGE_REF="ostree-image-signed:docker://ghcr.io/$IMAGE_VENDOR/$IMAGE_NAME" case $FEDORA_MAJOR_VERSION in - 38) + 39) IMAGE_TAG="latest" ;; + 38) + IMAGE_TAG="gts" + ;; *) IMAGE_TAG="$FEDORA_MAJOR_VERSION" ;;