From 2e67e63beb229bec8f7c89dfd38edde00bdd99d1 Mon Sep 17 00:00:00 2001
From: ver4a <ver4a@uncontrol.me>
Date: Sat, 9 Nov 2024 14:07:05 +0100
Subject: [PATCH] Make image name generic and fix cleanup

---
 .forgejo/workflows/build-image.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.forgejo/workflows/build-image.yaml b/.forgejo/workflows/build-image.yaml
index b6b253e..263f389 100644
--- a/.forgejo/workflows/build-image.yaml
+++ b/.forgejo/workflows/build-image.yaml
@@ -6,9 +6,9 @@ jobs:
       - uses: actions/checkout@v4
       - run:  cd ${{ env.GITHUB_WORKSPACE }}
       - run:  podman login -u ${{ vars.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }} ${{ vars.REGISTRY_DOMAIN }}
-      - run:  podman build . -f Dockerfile.kde --no-cache --pull=always --squash -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.MAIN_IMAGE }}:41
-      - run:  podman push --compression-format=zstd:chunked --compression-level=1 ${{ vars.REGISTRY_DOMAIN }}/${{ vars.MAIN_IMAGE }}:41 ${{ vars.REGISTRY_DOMAIN }}/${{ vars.MAIN_IMAGE }}:41
-      - run: podman build . -f Dockerfile.kde-nvidia --no-cache --pull=always --squash -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.MAIN_IMAGE }}:41-nvidia
-      - run: podman push --compression-format=zstd:chunked --compression-level=1 ${{ vars.REGISTRY_DOMAIN }}/${{ vars.MAIN_IMAGE }}:41-nvidia ${{ vars.REGISTRY_DOMAIN }}/${{ vars.MAIN_IMAGE }}:41-nvidia
+      - run:  podman build . -f Dockerfile.kde --no-cache --pull=always --squash -t ${{ vars.REGISTRY_DOMAIN }}/ver4a/aureolin:41-kde
+      - run:  podman push --compression-format=zstd:chunked --compression-level=1 ${{ vars.REGISTRY_DOMAIN }}/${{ vars.MAIN_IMAGE }}:41 ${{ vars.REGISTRY_DOMAIN }}/ver4a/aureolin:41-kde
+      - run: podman build . -f Dockerfile.kde-nvidia --no-cache --pull=always --squash -t ${{ vars.REGISTRY_DOMAIN }}/ver4a/aureolin:41-kde-nvidia
+      - run: podman push --compression-format=zstd:chunked --compression-level=1 ${{ vars.REGISTRY_DOMAIN }}/ver4a/aureolin:41-kde-nvidia ${{ vars.REGISTRY_DOMAIN }}/ver4a/aureolin:41-kde-nvidia
       - if: '!cancelled()'
-        run: podman image rm -f ${{ vars.REGISTRY_DOMAIN }}/${{ vars.MAIN_IMAGE }}:41 && podman image prune -f
+        run: podman image rm -f ${{ vars.REGISTRY_DOMAIN }}/ver4a/aureolin:41-kde ${{ vars.REGISTRY_DOMAIN }}/ver4a/aureolin:41-kde-nvidia:41 && podman image prune -f