From 3d8a358b3df9557675c95b63ecd26d3272f5ea88 Mon Sep 17 00:00:00 2001 From: Xaver Russ Date: Tue, 15 Jul 2025 00:28:11 +0200 Subject: [PATCH] changes here --- .forgejo/workflows/dockerindocker.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/dockerindocker.yml b/.forgejo/workflows/dockerindocker.yml index e1d5ab2..d90a2a0 100644 --- a/.forgejo/workflows/dockerindocker.yml +++ b/.forgejo/workflows/dockerindocker.yml @@ -39,9 +39,9 @@ jobs: file: ./containers/dockerindocker/Dockerfile platforms: linux/${{ matrix.arch }} push: true - tags: ${{ vars.REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:${{ matrix.arch }}-latest - cache-from: type=registry,ref=${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:buildcache-${{ matrix.arch }} - cache-to: type=registry,ref=${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:buildcache-${{ matrix.arch }},mode=max + tags: ${{ vars.REGISTRY }}/${{ vars.ORGANISATION }}/dockerindocker:${{ matrix.arch }}-latest + cache-from: type=registry,ref=${{ vars.REGISTRY }}/${{ vars.ORGANISATION }}/dockerindocker:buildcache-${{ matrix.arch }} + cache-to: type=registry,ref=${{ vars.REGISTRY }}/${{ vars.ORGANISATION }}/dockerindocker:buildcache-${{ matrix.arch }},mode=max create-manifest: name: Create and Publish Multi-Arch Manifest @@ -63,12 +63,12 @@ jobs: - name: Login to Forgejo Container Registry uses: docker/login-action@v3 with: - registry: ${{ secrets.CI_REGISTRY }} + registry: ${{ vars.REGISTRY }} username: ${{ secrets.CI_REGISTRY_USER }} password: ${{ secrets.CI_TOKEN }} - name: Create and Push Multi-Arch Manifest run: | - docker manifest create ${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:latest \ - --amend ${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:amd64-latest \ - --amend ${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:arm64-latest - docker manifest push ${{ secrets.CI_REGISTRY }}/${{ secrets.CI_REPOSITORY }}/dockerindocker:latest + docker manifest create ${{ vars.REGISTRY }}/${{ vars.ORGANISATION }}/dockerindocker:latest \ + --amend ${{ vars.REGISTRY }}/${{ vars.ORGANISATION }}/dockerindocker:amd64-latest \ + --amend ${{ vars.REGISTRY }}/${{ vars.ORGANISATION }}/dockerindocker:arm64-latest + docker manifest push ${{ vars.REGISTRY }}/${{ vars.ORGANISATION }}/dockerindocker:latest