From 34bdd53778b3732bd7306f15ccbff0076ecd2f91 Mon Sep 17 00:00:00 2001
From: ver4a <ver4a@uncontrol.me>
Date: Sun, 17 Nov 2024 00:16:41 +0100
Subject: [PATCH] Use dnf5 cache from base image build

The setup with separate container doesn't make sense, sharing the cache
directly from bash image build simplifies the entire caching setup.
---
 .forgejo/workflows/build-image.yaml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.forgejo/workflows/build-image.yaml b/.forgejo/workflows/build-image.yaml
index 4f4427b..b86db8c 100644
--- a/.forgejo/workflows/build-image.yaml
+++ b/.forgejo/workflows/build-image.yaml
@@ -9,11 +9,8 @@ jobs:
       - uses: actions/checkout@v4
       - run:  cd ${{ env.GITHUB_WORKSPACE }}
       - run:  podman login -u ${{ vars.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }} ${{ vars.REGISTRY_DOMAIN }}
-      # Prepare dnf5 metadata cache (fedora repos, rpmfusion will come later)
-      - run:  mkdir cache
-      - run:  podman run --replace --rm --pull=always --name kde-dnf-makecache -v ${PWD}/cache:/var/cache/libdnf5:z registry.fedoraproject.org/fedora-minimal:41 dnf5 makecache
       # base
-      - run:  podman build . -f Dockerfile.kde --no-cache --pull=always -v ${PWD}/cache:/var/cache/libdnf5:O --squash -t ${{ vars.REGISTRY_DOMAIN }}/ver4a/onc-kde:main
+      - run:  podman build . -f Dockerfile.kde --no-cache --pull=always -v ${PWD}/cache:/var/cache/libdnf5:z --squash -t ${{ vars.REGISTRY_DOMAIN }}/ver4a/onc-kde:main
       - run:  podman push --compression-format=zstd:chunked --compression-level=${{ vars.COMPRESSION_LEVEL }} ${{ vars.REGISTRY_DOMAIN }}/ver4a/onc-kde:main ${{ vars.REGISTRY_DOMAIN }}/ver4a/onc-kde:main
       # base + nvidia
       - run:  podman build . -f Dockerfile.kde-nvidia --no-cache --pull=never -v ${PWD}/cache:/var/cache/libdnf5:O --squash -t ${{ vars.REGISTRY_DOMAIN }}/ver4a/onc-kde:main-nvidia
@@ -32,11 +29,8 @@ jobs:
       - uses: actions/checkout@v4
       - run:  cd ${{ env.GITHUB_WORKSPACE }}
       - run:  podman login -u ${{ vars.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }} ${{ vars.REGISTRY_DOMAIN }}
-      # Prepare dnf5 metadata cache (fedora repos, rpmfusion will come later)$
-      - run:  mkdir cache
-      - run:  podman run --replace --rm --pull=always --name gnome-dnf-makecache -v ${PWD}/cache:/var/cache/libdnf5:z registry.fedoraproject.org/fedora-minimal:41 dnf5 makecache
       # base
-      - run:  podman build . -f Dockerfile.gnome --no-cache --pull=always -v ${PWD}/cache:/var/cache/libdnf5:O --squash -t ${{ vars.REGISTRY_DOMAIN }}/ver4a/onc-gnome:main
+      - run:  podman build . -f Dockerfile.gnome --no-cache --pull=always -v ${PWD}/cache:/var/cache/libdnf5:z --squash -t ${{ vars.REGISTRY_DOMAIN }}/ver4a/onc-gnome:main
       - run:  podman push --compression-format=zstd:chunked --compression-level=${{ vars.COMPRESSION_LEVEL }} ${{ vars.REGISTRY_DOMAIN }}/ver4a/onc-gnome:main ${{ vars.REGISTRY_DOMAIN }}/ver4a/onc-gnome:main
       # base + nvidia
       - run:  podman build . -f Dockerfile.gnome-nvidia --no-cache --pull=never -v ${PWD}/cache:/var/cache/libdnf5:O --squash -t ${{ vars.REGISTRY_DOMAIN }}/ver4a/onc-gnome:main-nvidia