From f4d2c45d94897cb29cf741f68fe7056b89b5195c Mon Sep 17 00:00:00 2001 From: Marc Di Luzio Date: Sun, 25 Aug 2024 23:47:20 +0100 Subject: [PATCH 1/2] Use var.DOCKER_REGISTRY for the registry location --- .forgejo/workflows/test-and-publish.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/test-and-publish.yml b/.forgejo/workflows/test-and-publish.yml index aade3f6..b9dffb9 100644 --- a/.forgejo/workflows/test-and-publish.yml +++ b/.forgejo/workflows/test-and-publish.yml @@ -9,9 +9,6 @@ on: pull_request: workflow_dispatch: -env: - REGISTRY: forge.mdiluz.io - jobs: # Run the tests scripts @@ -46,7 +43,7 @@ jobs: - name: Log in to the Container registry uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 with: - registry: ${{ env.REGISTRY }} + registry: ${{ var.DOCKER_REGISTRY }} username: ${{ env.GITHUB_ACTOR }} password: ${{ secrets.PACKAGE_PAT }} @@ -57,7 +54,7 @@ jobs: id: meta uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 with: - images: ${{ env.REGISTRY }}/${{ env.GITHUB_REPOSITORY }} + images: ${{ var.DOCKER_REGISTRY }}/${{ env.GITHUB_REPOSITORY }} tags: | type=ref,event=tag type=ref,event=branch From 7ce9769bf0f6bb9f48ed0213c2e8c700310b68a4 Mon Sep 17 00:00:00 2001 From: Marc Di Luzio Date: Sun, 25 Aug 2024 23:50:43 +0100 Subject: [PATCH 2/2] Pluralise the ${{ vars.x }} reference name --- .forgejo/workflows/test-and-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/test-and-publish.yml b/.forgejo/workflows/test-and-publish.yml index b9dffb9..0c15a17 100644 --- a/.forgejo/workflows/test-and-publish.yml +++ b/.forgejo/workflows/test-and-publish.yml @@ -43,7 +43,7 @@ jobs: - name: Log in to the Container registry uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 with: - registry: ${{ var.DOCKER_REGISTRY }} + registry: ${{ vars.DOCKER_REGISTRY }} username: ${{ env.GITHUB_ACTOR }} password: ${{ secrets.PACKAGE_PAT }} @@ -54,7 +54,7 @@ jobs: id: meta uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 with: - images: ${{ var.DOCKER_REGISTRY }}/${{ env.GITHUB_REPOSITORY }} + images: ${{ vars.DOCKER_REGISTRY }}/${{ env.GITHUB_REPOSITORY }} tags: | type=ref,event=tag type=ref,event=branch