ver4a/ostree-native-containers
1
0
Fork 0
Code Activity Actions

Use dnf5 cache from base image build
Some checks failed
/ build-kde (push) Failing after 3s
Details
/ build-gnome (push) Failing after 3s
Details

Browse source 
The setup with separate container doesn't make sense, sharing the cache
directly from bash image build simplifies the entire caching setup.
This commit is contained in:
ver4a 2024-11-17 00:16:41 +01:00
parent 33e6319c2e
commit 34bdd53778
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.forgejo/workflows/build-image.yaml
View file

@ -9,11 +9,8 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- run: cd ${{ env.GITHUB_WORKSPACE }} - run: cd ${{ env.GITHUB_WORKSPACE }}
- run: podman login -u ${{ vars.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }} ${{ vars.REGISTRY_DOMAIN }} - 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 # 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 - 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 # 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 - 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 - uses: actions/checkout@v4
- run: cd ${{ env.GITHUB_WORKSPACE }} - run: cd ${{ env.GITHUB_WORKSPACE }}
- run: podman login -u ${{ vars.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }} ${{ vars.REGISTRY_DOMAIN }} - 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 # 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 - 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 # 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 - 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