Merge branch 'launch' of https://github.com/frikky/shuffle into launch

.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,30 +54,22 @@ 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:
+          logout: false
           context: ${{ matrix.path }}/
           file: ${{ matrix.path }}/Dockerfile          
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: frikky/shuffle-${{ matrix.app }}:nightly
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+          tags: |
+            ghcr.io/shuffle/shuffle-${{ matrix.app }}:nightly
+            ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:nightly
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}