From 6f3be4b6978a25fbb36bd16fdfea72205323127c Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 24 Nov 2023 16:11:54 +0100 Subject: [PATCH] Backport PR #4641: Publish to Docker Hub alongside Quay.io Publish to Docker Hub alongside Quay.io (cherry picked from commit 7613ba170fb5eb106255485879bcd12c40189c31) --- .github/workflows/release.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fd8441b2..2dfca79a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -126,6 +126,7 @@ jobs: if: env.REGISTRY != 'localhost:5000/' run: | docker login -u "${{ secrets.QUAY_USERNAME }}" -p "${{ secrets.QUAY_PASSWORD }}" "${{ env.REGISTRY }}" + docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" -p "${{ secrets.DOCKERHUB_TOKEN }}" docker.io # image: jupyterhub/jupyterhub # @@ -141,7 +142,9 @@ jobs: uses: jupyterhub/action-major-minor-tag-calculator@v2 with: githubToken: ${{ secrets.GITHUB_TOKEN }} - prefix: "${{ env.REGISTRY }}jupyterhub/jupyterhub:" + prefix: >- + ${{ env.REGISTRY }}jupyterhub/jupyterhub: + jupyterhub/jupyterhub: defaultTag: "${{ env.REGISTRY }}jupyterhub/jupyterhub:noref" branchRegex: ^\w[\w-.]*$ @@ -162,7 +165,9 @@ jobs: uses: jupyterhub/action-major-minor-tag-calculator@v2 with: githubToken: ${{ secrets.GITHUB_TOKEN }} - prefix: "${{ env.REGISTRY }}jupyterhub/jupyterhub-onbuild:" + prefix: >- + ${{ env.REGISTRY }}jupyterhub/jupyterhub-onbuild: + jupyterhub/jupyterhub-onbuild: defaultTag: "${{ env.REGISTRY }}jupyterhub/jupyterhub-onbuild:noref" branchRegex: ^\w[\w-.]*$ @@ -183,7 +188,9 @@ jobs: uses: jupyterhub/action-major-minor-tag-calculator@v2 with: githubToken: ${{ secrets.GITHUB_TOKEN }} - prefix: "${{ env.REGISTRY }}jupyterhub/jupyterhub-demo:" + prefix: >- + ${{ env.REGISTRY }}jupyterhub/jupyterhub-demo: + jupyterhub/jupyterhub-demo: defaultTag: "${{ env.REGISTRY }}jupyterhub/jupyterhub-demo:noref" branchRegex: ^\w[\w-.]*$ @@ -207,7 +214,9 @@ jobs: uses: jupyterhub/action-major-minor-tag-calculator@v2 with: githubToken: ${{ secrets.GITHUB_TOKEN }} - prefix: "${{ env.REGISTRY }}jupyterhub/singleuser:" + prefix: >- + ${{ env.REGISTRY }}jupyterhub/singleuser: + jupyterhub/singleuser: defaultTag: "${{ env.REGISTRY }}jupyterhub/singleuser:noref" branchRegex: ^\w[\w-.]*$