diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml index 1f885499..613a4dd1 100644 --- a/.github/workflows/docker-release.yml +++ b/.github/workflows/docker-release.yml @@ -67,6 +67,12 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + + - uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: pull images run: | docker pull --platform=linux/amd64 ghcr.io/diced/zipline:${{ steps.version.outputs.zipline_version }}-amd64 @@ -79,9 +85,17 @@ jobs: --amend ghcr.io/diced/zipline:${{ steps.version.outputs.zipline_version }}-arm64 && \ docker manifest create ghcr.io/diced/zipline:latest \ --amend ghcr.io/diced/zipline:${{ steps.version.outputs.zipline_version }}-amd64 \ - --amend ghcr.io/diced/zipline:${{ steps.version.outputs.zipline_version }}-arm64 + --amend ghcr.io/diced/zipline:${{ steps.version.outputs.zipline_version }}-arm64 && \ + docker manifest create docker.io/diced/zipline:${{ steps.version.outputs.zipline_version }} \ + --amend docker.io/diced/zipline:${{ steps.version.outputs.zipline_version }}-amd64 \ + --amend docker.io/diced/zipline:${{ steps.version.outputs.zipline_version }}-arm64 && \ + docker manifest create docker.io/diced/zipline:latest \ + --amend docker.io/diced/zipline:${{ steps.version.outputs.zipline_version }}-amd64 \ + --amend docker.io/diced/zipline:${{ steps.version.outputs.zipline_version }}-arm64 - name: push manifests run: | - docker manifest push ghcr.io/diced/zipline:${{ steps.version.outputs.zipline_version }} && \ + docker manifest push ghcr.io/diced/zipline:${{ steps.version.outputs.zipline_version }} docker manifest push ghcr.io/diced/zipline:latest + docker manifest push docker.io/diced/zipline:${{ steps.version.outputs.zipline_version }} + docker manifest push docker.io/diced/zipline:latest diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 57e1456e..4a26d7d0 100755 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -55,6 +55,12 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + + - uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: pull images run: | docker pull --platform=linux/amd64 ghcr.io/diced/zipline:trunk-${{ steps.sha.outputs.short_sha }}-amd64 @@ -71,9 +77,17 @@ jobs: docker manifest create ghcr.io/diced/zipline:v4 \ --amend ghcr.io/diced/zipline:trunk-${{ steps.sha.outputs.short_sha }}-amd64 \ --amend ghcr.io/diced/zipline:trunk-${{ steps.sha.outputs.short_sha }}-arm64 + docker manifest create ${{ secrets.DOCKERHUB_USERNAME }}/zipline:trunk \ + --amend ghcr.io/diced/zipline:trunk-${{ steps.sha.outputs.short_sha }}-amd64 \ + --amend ghcr.io/diced/zipline:trunk-${{ steps.sha.outputs.short_sha }}-arm64 && \ + docker manifest create ${{ secrets.DOCKERHUB_USERNAME }}/zipline:trunk-${{ steps.sha.outputs.short_sha }} \ + --amend ghcr.io/diced/zipline:trunk-${{ steps.sha.outputs.short_sha }}-amd64 \ + --amend ghcr.io/diced/zipline:trunk-${{ steps.sha.outputs.short_sha }}-arm64 && \ - name: push manifests run: | - docker manifest push ghcr.io/diced/zipline:trunk-${{ steps.sha.outputs.short_sha }} && \ - docker manifest push ghcr.io/diced/zipline:trunk && \ + docker manifest push ghcr.io/diced/zipline:trunk-${{ steps.sha.outputs.short_sha }} + docker manifest push ghcr.io/diced/zipline:trunk docker manifest push ghcr.io/diced/zipline:v4 + docker manifest push ${{ secrets.DOCKERHUB_USERNAME }}/zipline:trunk-${{ steps.sha.outputs.short_sha }} + docker manifest push ${{ secrets.DOCKERHUB_USERNAME }}/zipline:trunk