From aa55afa648967d1d156154a3832c77cf76603327 Mon Sep 17 00:00:00 2001 From: thislight Date: Sun, 14 Jul 2024 15:21:29 +0800 Subject: [PATCH] fedora-40: use self-hosted image to build --- .forgejo/workflows/build-fedora-40.yml | 14 ++++++-------- fedora-40/Containerfile | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/build-fedora-40.yml b/.forgejo/workflows/build-fedora-40.yml index 544dd0d..50ae286 100644 --- a/.forgejo/workflows/build-fedora-40.yml +++ b/.forgejo/workflows/build-fedora-40.yml @@ -17,10 +17,8 @@ jobs: build: runs-on: linux-lg container: - image: fedora:40 + image: code.lightstands.xyz/standcoded/fedora:40 steps: - - name: Install Tools - run: 'dnf install -y --setopt install_weak_deps=False nodejs git buildah qemu-user-static qemu-user-binfmt fuse-overlayfs --exclude container-selinux' - name: Checkout uses: actions/checkout@v3 - name: Fulfill Package Manager Cache @@ -28,17 +26,17 @@ jobs: - name: Build Minimal Images run: | cd fedora-40-minimal && \ - buildah --storage-opt mount_program=/usr/bin/fuse-overlayfs --cgroup-manager=cgroupfs manifest create code.lightstands.xyz/standcoded/fedora:40-minimal && \ - buildah --storage-opt mount_program=/usr/bin/fuse-overlayfs --cgroup-manager=cgroupfs build --arch aarch64 \ + buildah --cgroup-manager=cgroupfs manifest create code.lightstands.xyz/standcoded/fedora-minimal:40 && \ + buildah --cgroup-manager=cgroupfs build --arch aarch64 \ --pid=host --ipc=host --network=host --userns=host --uts=host -v /var/cache/dnf:/var/cache/dnf \ - --manifest code.lightstands.xyz/standcoded/fedora:40-minimal . + --manifest code.lightstands.xyz/standcoded/fedora-minimal:40 . env: BUILDAH_ISOLATION: chroot - name: Build Images run: | cd fedora-40 && \ - buildah --storage-opt mount_program=/usr/bin/fuse-overlayfs --cgroup-manager=cgroupfs manifest create code.lightstands.xyz/standcoded/fedora:40 && \ - buildah --storage-opt mount_program=/usr/bin/fuse-overlayfs --cgroup-manager=cgroupfs build --arch aarch64 \ + buildah --cgroup-manager=cgroupfs manifest create code.lightstands.xyz/standcoded/fedora:40 && \ + buildah --cgroup-manager=cgroupfs build --arch aarch64 \ --pid=host --ipc=host --network=host --userns=host --uts=host -v /var/cache/dnf:/var/cache/dnf \ --manifest code.lightstands.xyz/standcoded/fedora:40 . env: diff --git a/fedora-40/Containerfile b/fedora-40/Containerfile index 3aa9885..2bccb3c 100644 --- a/fedora-40/Containerfile +++ b/fedora-40/Containerfile @@ -1,4 +1,4 @@ -FROM code.lightstands.xyz/standcoded/fedora:40-minimal +FROM code.lightstands.xyz/standcoded/fedora-minimal:40 RUN dnf install -y --setopt install_weak_deps=False sqlite-devel binutils