From 558b47b7dd99604e60ca8c01b1a2815b66320e1e Mon Sep 17 00:00:00 2001
From: Frikky <fredrik_9490@hotmail.com>
Date: Sat, 22 Oct 2022 22:54:20 +0200
Subject: [PATCH] Testing new docker build with GHCR instead of dockerhub

---
 .github/workflows/dockerbuild.yaml | 52 +++++++++++++++---------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml
index 6e69e896..1c9e5f63 100644
--- a/.github/workflows/dockerbuild.yaml
+++ b/.github/workflows/dockerbuild.yaml
@@ -41,34 +41,21 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       
-      - name: Login to DockerHub
+      # 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
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ghcr.io
+          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: Login to Ghcr 
-      #  uses: docker/login-action@v2
-      #  with:
-      #    registry: ghcr.io
-      #    username: frikky
-      #    password: ${{ secrets.GHCR_PW }} 
-
-      #- name: Ghcr Build and push
-      #  id: docker_build
+      #- name: Dockerhub Build and push 
+      #  id: docker_build_dockerhub
       #  uses: docker/build-push-action@v2
       #  env:
       #    BUILDX_NO_DEFAULT_LOAD: true
@@ -76,8 +63,21 @@ jobs:
       #    context: ${{ matrix.path }}/
       #    file: ${{ matrix.path }}/Dockerfile          
       #    platforms: linux/amd64,linux/arm64
+      #    #,linux/386 - no node image I guess?
       #    push: true
-      #    tags: frikky/shuffle-${{ matrix.app }}:nightly
+      #    tags: ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:nightly  
+
+      - name: Ghcr Build and push
+        id: docker_build
+        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
+          push: true
+          tags: frikky/shuffle-${{ matrix.app }}:nightly
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}