From 938c90acda5d8bf9c7eaa6d16079da3471704fb6 Mon Sep 17 00:00:00 2001 From: smiggiddy Date: Sat, 3 May 2025 12:56:50 +0000 Subject: [PATCH 1/8] use variable for registry --- .github/workflows/build.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6119b9d..d921c03 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,13 +32,24 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Set Registry based on GITHUB_SERVER_URL + run: | + if [[ "${{ github.server_url }}" == *"github.com"* ]]; then + echo "REGISTRY=ghcr.io" >> $GITHUB_ENV + elif [[ "${{ github.server_url }}" == *"git.thecodedom.com"* ]]; then + echo "REGISTRY=git.thecodedom.com" >> $GITHUB_ENV + else + echo "REGISTRY=ghcr.io" >> $GITHUB_ENV + fi + echo "Registry is $REGISTRY" + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: - registry: ${{ github.registry }} + registry: ${{ env.registry }} username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} From d3a3e199c7402340326356e611f654ee09ce2c57 Mon Sep 17 00:00:00 2001 From: smiggiddy Date: Sat, 3 May 2025 12:58:37 +0000 Subject: [PATCH 2/8] use variable for registry --- .github/workflows/build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d921c03..1c387a0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,12 +34,10 @@ jobs: - name: Set Registry based on GITHUB_SERVER_URL run: | - if [[ "${{ github.server_url }}" == *"github.com"* ]]; then + if [[ "${{ github.server_url }}" == "*github.com*" ]]; then echo "REGISTRY=ghcr.io" >> $GITHUB_ENV - elif [[ "${{ github.server_url }}" == *"git.thecodedom.com"* ]]; then + elif [[ "${{ github.server_url }}" == "*git.thecodedom.com"* ]]; then echo "REGISTRY=git.thecodedom.com" >> $GITHUB_ENV - else - echo "REGISTRY=ghcr.io" >> $GITHUB_ENV fi echo "Registry is $REGISTRY" From 829481c55e6f3c0c4fd9c9603536d0f51a38326c Mon Sep 17 00:00:00 2001 From: smiggiddy Date: Sat, 3 May 2025 13:01:35 +0000 Subject: [PATCH 3/8] use variable for registry --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c387a0..6f6116a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,10 +34,13 @@ jobs: - name: Set Registry based on GITHUB_SERVER_URL run: | - if [[ "${{ github.server_url }}" == "*github.com*" ]]; then + SERVER_URL="${{ github.server_url }}" + if [[ "${SERVER_URL}" == "*github.com*" ]]; then echo "REGISTRY=ghcr.io" >> $GITHUB_ENV - elif [[ "${{ github.server_url }}" == "*git.thecodedom.com"* ]]; then + REGISTRY=ghcr.io + elif [[ "${SERVER_URL}" == "*git.thecodedom.com"* ]]; then echo "REGISTRY=git.thecodedom.com" >> $GITHUB_ENV + REGISTRY=git.thecodedom.com fi echo "Registry is $REGISTRY" From cc1fd8e24d50905963a3b16eeb6a991e63a78d93 Mon Sep 17 00:00:00 2001 From: smiggiddy Date: Sat, 3 May 2025 13:06:46 +0000 Subject: [PATCH 4/8] use variable for registry --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f6116a..404234a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,10 +35,10 @@ jobs: - name: Set Registry based on GITHUB_SERVER_URL run: | SERVER_URL="${{ github.server_url }}" - if [[ "${SERVER_URL}" == "*github.com*" ]]; then + if [[ "${SERVER_URL}" =~ "*github.com*" ]]; then echo "REGISTRY=ghcr.io" >> $GITHUB_ENV REGISTRY=ghcr.io - elif [[ "${SERVER_URL}" == "*git.thecodedom.com"* ]]; then + elif [[ "${SERVER_URL}" =~ "*git.thecodedom.com*" ]]; then echo "REGISTRY=git.thecodedom.com" >> $GITHUB_ENV REGISTRY=git.thecodedom.com fi From 3224db927b276f91f04b3fe6f445619dad955c75 Mon Sep 17 00:00:00 2001 From: smiggiddy Date: Sat, 3 May 2025 13:18:18 +0000 Subject: [PATCH 5/8] use variable for registry --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 404234a..41fc01c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,10 +35,10 @@ jobs: - name: Set Registry based on GITHUB_SERVER_URL run: | SERVER_URL="${{ github.server_url }}" - if [[ "${SERVER_URL}" =~ "*github.com*" ]]; then + if [[ "${SERVER_URL}" =~ "github.com" ]]; then echo "REGISTRY=ghcr.io" >> $GITHUB_ENV REGISTRY=ghcr.io - elif [[ "${SERVER_URL}" =~ "*git.thecodedom.com*" ]]; then + elif [[ "${SERVER_URL}" =~ "git.thecodedom.com" ]]; then echo "REGISTRY=git.thecodedom.com" >> $GITHUB_ENV REGISTRY=git.thecodedom.com fi From 907e6f3338035134e5400768c8271872d1872b41 Mon Sep 17 00:00:00 2001 From: smiggiddy Date: Sat, 3 May 2025 13:19:59 +0000 Subject: [PATCH 6/8] use variable for registry --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41fc01c..8f98710 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: - registry: ${{ env.registry }} + registry: ${{ env.REGISTRY }} username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} From 6fa2cb39c0f3730170d77dfc50fabc075d0c5c96 Mon Sep 17 00:00:00 2001 From: smiggiddy Date: Sat, 3 May 2025 13:23:02 +0000 Subject: [PATCH 7/8] use variable for registry --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f98710..2476116 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: - registry: ${{ env.REGISTRY }} + registry: $registry username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} From 9ed08c11e398291cfb748deee49d23a1b7ba1ffe Mon Sep 17 00:00:00 2001 From: smiggiddy Date: Sat, 3 May 2025 13:23:36 +0000 Subject: [PATCH 8/8] use variable for registry --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2476116..8f98710 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: - registry: $registry + registry: ${{ env.REGISTRY }} username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }}