From 2a9c700891ab76c31e6480af035dd98edaa28278 Mon Sep 17 00:00:00 2001 From: Daniel Pimenta Date: Mon, 23 Oct 2023 13:56:04 +0100 Subject: [PATCH] Update ci --- .github/workflows/docker-publish-develop.yml | 8 ++++---- ...{docker-publish-master.yml => docker-publish-main.yml} | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) rename .github/workflows/{docker-publish-master.yml => docker-publish-main.yml} (95%) diff --git a/.github/workflows/docker-publish-develop.yml b/.github/workflows/docker-publish-develop.yml index 1071ab6..58753e5 100644 --- a/.github/workflows/docker-publish-develop.yml +++ b/.github/workflows/docker-publish-develop.yml @@ -15,7 +15,7 @@ on: env: # Use docker.io for Docker Hub if empty - REGISTRY: ghcr.io + GITHUB_REGISTRY: ghcr.io DOCKER_REGISTRY: docker.io IMAGE_NAME: ${{ github.repository }} @@ -48,11 +48,11 @@ jobs: # Login against a Docker registry except on PR # https://github.com/docker/login-action - - name: Log into registry ${{ env.REGISTRY }} + - name: Log into registry ${{ env.GITHUB_REGISTRY }} if: github.event_name != 'pull_request' uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c with: - registry: ${{ env.REGISTRY }} + registry: ${{ env.GITHUB_REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} @@ -62,7 +62,7 @@ jobs: id: meta uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + images: ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }} tags: | type=raw,value=develop type=ref,event=tag diff --git a/.github/workflows/docker-publish-master.yml b/.github/workflows/docker-publish-main.yml similarity index 95% rename from .github/workflows/docker-publish-master.yml rename to .github/workflows/docker-publish-main.yml index 306ff0d..560fae5 100644 --- a/.github/workflows/docker-publish-master.yml +++ b/.github/workflows/docker-publish-main.yml @@ -15,7 +15,7 @@ on: env: # Use docker.io for Docker Hub if empty - REGISTRY: ghcr.io + GITHUB_REGISTRY: ghcr.io # github.repository as / IMAGE_NAME: ${{ github.repository }} @@ -48,11 +48,11 @@ jobs: # Login against a Docker registry except on PR # https://github.com/docker/login-action - - name: Log into registry ${{ env.REGISTRY }} + - name: Log into registry ${{ env.GITHUB_REGISTRY }} if: github.event_name != 'pull_request' uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c with: - registry: ${{ env.REGISTRY }} + registry: ${{ env.GITHUB_REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} @@ -62,7 +62,7 @@ jobs: id: meta uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + images: ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }} tags: | type=raw,value=production type=ref,event=tag