From 6eea979c46edd2c2b00d065c024f0292f43cc847 Mon Sep 17 00:00:00 2001 From: Frikky Date: Sat, 22 Oct 2022 23:00:52 +0200 Subject: [PATCH 1/3] Test multi-registry push --- .github/workflows/dockerbuild.yaml | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml index 1c9e5f63..631c7963 100644 --- a/.github/workflows/dockerbuild.yaml +++ b/.github/workflows/dockerbuild.yaml @@ -41,11 +41,11 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - # name: Login to DockerHub - # uses: docker/login-action@v2 - # with: - # username: ${{ secrets.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Ghcr uses: docker/login-action@v2 @@ -54,22 +54,9 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - #- name: Dockerhub Build and push - # id: docker_build_dockerhub - # uses: docker/build-push-action@v2 - # env: - # BUILDX_NO_DEFAULT_LOAD: true - # with: - # context: ${{ matrix.path }}/ - # file: ${{ matrix.path }}/Dockerfile - # platforms: linux/amd64,linux/arm64 - # #,linux/386 - no node image I guess? - # push: true - # tags: ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:nightly - - name: Ghcr Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 env: BUILDX_NO_DEFAULT_LOAD: true with: @@ -77,7 +64,9 @@ jobs: file: ${{ matrix.path }}/Dockerfile platforms: linux/amd64,linux/arm64 push: true - tags: frikky/shuffle-${{ matrix.app }}:nightly + tags: | + ghcr.io/frikky/shuffle-${{ matrix.app }}:nightly + ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:nightly - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} From a97a5b715bfa6e25bbf1ef6b76d71d2089e4956b Mon Sep 17 00:00:00 2001 From: Frikky Date: Sat, 22 Oct 2022 23:20:11 +0200 Subject: [PATCH 2/3] Update dockerbuild.yaml --- .github/workflows/dockerbuild.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml index 631c7963..51df3f3a 100644 --- a/.github/workflows/dockerbuild.yaml +++ b/.github/workflows/dockerbuild.yaml @@ -60,10 +60,13 @@ jobs: env: BUILDX_NO_DEFAULT_LOAD: true with: + logout: false context: ${{ matrix.path }}/ file: ${{ matrix.path }}/Dockerfile platforms: linux/amd64,linux/arm64 push: true + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache tags: | ghcr.io/frikky/shuffle-${{ matrix.app }}:nightly ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:nightly From 6411b620c6d9165924b177fca2c92a07a5f5425b Mon Sep 17 00:00:00 2001 From: Frikky Date: Sat, 22 Oct 2022 23:22:31 +0200 Subject: [PATCH 3/3] Update dockerbuild.yaml --- .github/workflows/dockerbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml index 51df3f3a..96e5b869 100644 --- a/.github/workflows/dockerbuild.yaml +++ b/.github/workflows/dockerbuild.yaml @@ -68,7 +68,7 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache tags: | - ghcr.io/frikky/shuffle-${{ matrix.app }}:nightly + ghcr.io/shuffle/shuffle-${{ matrix.app }}:nightly ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:nightly - name: Image digest