diff --git a/.github/workflows/main-build.yaml b/.github/workflows/main-build.yaml index 404da96..7f004c3 100644 --- a/.github/workflows/main-build.yaml +++ b/.github/workflows/main-build.yaml @@ -59,8 +59,7 @@ jobs: uses: redhat-actions/buildah-build@v2 with: image: ${{ env.IMAGE_NAME }} - # On main tag both 'latest' and '42'; on release-42 tag '42'. - tags: ${{ github.ref == 'refs/heads/main' && 'latest 42 ' || (github.ref == 'refs/heads/release-42' && '42 ' || '') }}${{ github.sha }} + tags: ${{ github.ref == 'refs/heads/release-42' && '42 ' || 'latest 43 ' }}${{ github.sha }} layers: True containerfiles: | ./Containerfile diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index a1eb174..d2b0e78 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -36,4 +36,4 @@ jobs: image: ${{ env.IMAGE_NAME }} layers: True containerfiles: | - ./Containerfile \ No newline at end of file + ./Containerfile diff --git a/Containerfile b/Containerfile index 89bb138..7bbb708 100644 --- a/Containerfile +++ b/Containerfile @@ -1,6 +1,6 @@ -FROM quay.io/fedora/fedora-bootc:42@sha256:2c48b779ef9e6c9a073f741167d56d9475c7fccf3d834d5c650f78eeacb330ae AS builder +FROM quay.io/fedora/fedora-bootc:43@sha256:2ea291797d86cf7c8c3f0e62a7993e247acc1dbd7ecc776608010c2684314618 AS builder # https://bugzilla.redhat.com/show_bug.cgi?id=2381864 -RUN dnf upgrade --enablerepo=updates-testing --refresh --advisory=FEDORA-2025-77e737a366 +RUN dnf upgrade -y --refresh RUN dnf install -y --exclude rootfiles @kde-desktop-environment @development-tools @container-management @system-tools @games; dnf clean all RUN systemctl disable abrtd atd mcelog RUN systemctl set-default graphical.target diff --git a/Makefile b/Makefile index 81a728f..6950abf 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -OCI_IMAGE ?= ghcr.io/compphy/framework-fedora-bootc:latest -DISK_TYPE ?= anaconda-iso +OCI_IMAGE ?= ghcr.io/compphy/framework-fedora-bootc:latest +DISK_TYPE ?= raw ROOTFS ?= ext4 ARCH ?= amd64 # Use upsteam build: @@ -10,6 +10,7 @@ BIB_IMAGE ?= localhost/bootc-image-builder:latest # See https://github.com/osbuild/bootc-image-builder .PHONY: disk-image disk-image: + podman build -t framework-fedora-bootc $(CURDIR) podman build -t bootc-image-builder $(CURDIR)/bootc-image-builder mkdir -p ./output mkdir -p /var/lib/containers/storage @@ -28,4 +29,4 @@ disk-image: --type $(DISK_TYPE) \ --rootfs $(ROOTFS) \ --use-librepo \ - $(OCI_IMAGE) \ No newline at end of file + localhost/framework-fedora-bootc:latest \ No newline at end of file diff --git a/bootc-image-builder b/bootc-image-builder index a8e8ad7..6a6cd92 160000 --- a/bootc-image-builder +++ b/bootc-image-builder @@ -1 +1 @@ -Subproject commit a8e8ad78da94a1e0ba52a95893cc7e34157f8842 +Subproject commit 6a6cd928962cce3fb85bb694e3b790c64b7576b9