diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index aa76726..40d5b56 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -79,14 +79,6 @@ jobs: restore-keys: | ${{ runner.os }}-buildx-${{ env.SAFE_ARCH }}- -# - name: Login to ghcr registry -# uses: docker/login-action@v2 -# if: ${{ github.event_name != 'pull_request' }} -# with: -# registry: ghcr.io -# username: ${{ secrets.GH_USERNAME }} -# password: ${{ secrets.GH_ACCESS_TOKEN }} - - name: Login to Docker Hub registry uses: docker/login-action@v2 if: ${{ github.event_name != 'pull_request' }} @@ -157,13 +149,6 @@ jobs: docker load --input image_linuxarm64/linuxarm64.tar docker load --input image_linuxppc64le/linuxppc64le.tar -# - name: Login to ghcr registry -# uses: docker/login-action@v2 -# with: -# registry: ghcr.io -# username: ${{ secrets.GH_USERNAME }} -# password: ${{ secrets.GH_ACCESS_TOKEN }} - - name: Login to Docker Hub registry uses: docker/login-action@v2 with: @@ -172,33 +157,6 @@ jobs: - name: Create and push manifest run: | -# # -- Push to ghcr.io -# docker manifest create ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }} \ -# --amend ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linux386 \ -# --amend ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxamd64 \ -# --amend ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarmv6 \ -# --amend ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarmv7 \ -# --amend ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarm64 \ -# --amend ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxppc64le -# docker manifest push ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }} -# -# # Tag images as VERSION (like 'latest') -# docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linux386 ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linux386 -# docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxamd64 ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxamd64 -# docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarmv6 ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxarmv6 -# docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarmv7 ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxarmv7 -# docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxarm64 ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxarm64 -# docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxppc64le ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxppc64le -# -# docker manifest create ${{ env.IMAGE_TAG }}:${{ env.VERSION }} \ -# --amend ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linux386 \ -# --amend ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxamd64 \ -# --amend ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxarmv6 \ -# --amend ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxarmv7 \ -# --amend ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxarm64 \ -# --amend ${{ env.IMAGE_TAG }}:${{ env.VERSION }}-linuxppc64le -# docker manifest push ${{ env.IMAGE_TAG }}:${{ env.VERSION }} - # -- Push to Docker Hub docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linux386 ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linux386 docker tag ${{ env.IMAGE_TAG }}:${{ env.HASH_VERSION }}-linuxamd64 ${{ env.IMAGE_TAG_DH }}:${{ env.VERSION }}-linuxamd64