From 13f15485db7332bfa8622dc2d7666512e2d3fa26 Mon Sep 17 00:00:00 2001 From: bbk Date: Tue, 15 Aug 2023 12:23:07 +0200 Subject: [PATCH 1/3] use env.REGISTRY_REPO for docker hub --- .github/workflows/docker-base.yml | 2 +- .github/workflows/docker-demo.yml | 2 +- .github/workflows/docker.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-base.yml b/.github/workflows/docker-base.yml index 70387f519..cfbd1f8dc 100644 --- a/.github/workflows/docker-base.yml +++ b/.github/workflows/docker-base.yml @@ -39,4 +39,4 @@ jobs: push: true file: extras/docker/base/Dockerfile platforms: linux/amd64,linux/arm64,linux/arm/v7 - tags: wger/base:latest,wger/base:2.2-dev + tags: ${{ env.REGISTRY_REPO }}/base:latest,${{ env.REGISTRY_REPO }}/base:2.2-dev diff --git a/.github/workflows/docker-demo.yml b/.github/workflows/docker-demo.yml index 8d83a11f5..f3e6c9379 100644 --- a/.github/workflows/docker-demo.yml +++ b/.github/workflows/docker-demo.yml @@ -41,4 +41,4 @@ jobs: push: true file: extras/docker/demo/Dockerfile platforms: linux/amd64,linux/arm64 - tags: wger/demo:latest,wger/demo:2.2-dev,wger/apache:latest,wger/apache:2.2-dev + tags: ${{ env.REGISTRY_REPO }}/demo:latest,${{ env.REGISTRY_REPO }}/demo:2.2-dev,${{ env.REGISTRY_REPO }}/apache:latest,${{ env.REGISTRY_REPO }}/apache:2.2-dev diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index bc2bdd9a1..b1518542d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -8,8 +8,8 @@ on: - master env: - REGISTRY_IMAGE: wger/server - REGISTRY_IMAGE_ALT: wger/devel + REGISTRY_IMAGE: ${{ env.REGISTRY_REPO }}/server + REGISTRY_IMAGE_ALT: ${{ env.REGISTRY_REPO }}/devel jobs: build-prod: From f016659805b9198ac5d135e62c7fb0387e5ff2f7 Mon Sep 17 00:00:00 2001 From: bbk Date: Tue, 15 Aug 2023 12:31:54 +0200 Subject: [PATCH 2/3] it's $REGISTRY_REPO not $env.REGISTRY_REPO --- .github/workflows/docker-base.yml | 2 +- .github/workflows/docker-demo.yml | 2 +- .github/workflows/docker.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-base.yml b/.github/workflows/docker-base.yml index cfbd1f8dc..7701e68cf 100644 --- a/.github/workflows/docker-base.yml +++ b/.github/workflows/docker-base.yml @@ -39,4 +39,4 @@ jobs: push: true file: extras/docker/base/Dockerfile platforms: linux/amd64,linux/arm64,linux/arm/v7 - tags: ${{ env.REGISTRY_REPO }}/base:latest,${{ env.REGISTRY_REPO }}/base:2.2-dev + tags: ${{ REGISTRY_REPO }}/base:latest,${{ REGISTRY_REPO }}/base:2.2-dev diff --git a/.github/workflows/docker-demo.yml b/.github/workflows/docker-demo.yml index f3e6c9379..40b7a7363 100644 --- a/.github/workflows/docker-demo.yml +++ b/.github/workflows/docker-demo.yml @@ -41,4 +41,4 @@ jobs: push: true file: extras/docker/demo/Dockerfile platforms: linux/amd64,linux/arm64 - tags: ${{ env.REGISTRY_REPO }}/demo:latest,${{ env.REGISTRY_REPO }}/demo:2.2-dev,${{ env.REGISTRY_REPO }}/apache:latest,${{ env.REGISTRY_REPO }}/apache:2.2-dev + tags: ${{ REGISTRY_REPO }}/demo:latest,${{ REGISTRY_REPO }}/demo:2.2-dev,${{ REGISTRY_REPO }}/apache:latest,${{ REGISTRY_REPO }}/apache:2.2-dev diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b1518542d..8bf79d99f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -8,8 +8,8 @@ on: - master env: - REGISTRY_IMAGE: ${{ env.REGISTRY_REPO }}/server - REGISTRY_IMAGE_ALT: ${{ env.REGISTRY_REPO }}/devel + REGISTRY_IMAGE: ${{ REGISTRY_REPO }}/server + REGISTRY_IMAGE_ALT: ${{ REGISTRY_REPO }}/devel jobs: build-prod: From 24f7efc1354c36904bd23fb50b8853fbd7de2138 Mon Sep 17 00:00:00 2001 From: bbk Date: Tue, 15 Aug 2023 12:36:42 +0200 Subject: [PATCH 3/3] actually it seems to be `$vars.` --- .github/workflows/docker-base.yml | 2 +- .github/workflows/docker-demo.yml | 2 +- .github/workflows/docker.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-base.yml b/.github/workflows/docker-base.yml index 7701e68cf..b3142c791 100644 --- a/.github/workflows/docker-base.yml +++ b/.github/workflows/docker-base.yml @@ -39,4 +39,4 @@ jobs: push: true file: extras/docker/base/Dockerfile platforms: linux/amd64,linux/arm64,linux/arm/v7 - tags: ${{ REGISTRY_REPO }}/base:latest,${{ REGISTRY_REPO }}/base:2.2-dev + tags: ${{ vars.REGISTRY_REPO }}/base:latest,${{ vars.REGISTRY_REPO }}/base:2.2-dev diff --git a/.github/workflows/docker-demo.yml b/.github/workflows/docker-demo.yml index 40b7a7363..4a4ae37f6 100644 --- a/.github/workflows/docker-demo.yml +++ b/.github/workflows/docker-demo.yml @@ -41,4 +41,4 @@ jobs: push: true file: extras/docker/demo/Dockerfile platforms: linux/amd64,linux/arm64 - tags: ${{ REGISTRY_REPO }}/demo:latest,${{ REGISTRY_REPO }}/demo:2.2-dev,${{ REGISTRY_REPO }}/apache:latest,${{ REGISTRY_REPO }}/apache:2.2-dev + tags: ${{ vars.REGISTRY_REPO }}/demo:latest,${{ vars.REGISTRY_REPO }}/demo:2.2-dev,${{ vars.REGISTRY_REPO }}/apache:latest,${{ vars.REGISTRY_REPO }}/apache:2.2-dev diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8bf79d99f..b1b94191d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -8,8 +8,8 @@ on: - master env: - REGISTRY_IMAGE: ${{ REGISTRY_REPO }}/server - REGISTRY_IMAGE_ALT: ${{ REGISTRY_REPO }}/devel + REGISTRY_IMAGE: ${{ vars.REGISTRY_REPO }}/server + REGISTRY_IMAGE_ALT: ${{ vars.REGISTRY_REPO }}/devel jobs: build-prod: