From 1730b8148ce6e538170b2876cb367c4a12ae8f19 Mon Sep 17 00:00:00 2001
From: L Laniewski-Wollk <uqllanie@uq.edu.au>
Date: Thu, 7 Sep 2023 16:00:46 +1000
Subject: [PATCH] Adding docker hub deploy

---
 .github/workflows/cpu_test.yml | 19 ++++++++++++++++---
 generate.Rt                    | 17 +++++++++++------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/cpu_test.yml b/.github/workflows/cpu_test.yml
index 5320fe2..e8097ad 100644
--- a/.github/workflows/cpu_test.yml
+++ b/.github/workflows/cpu_test.yml
@@ -19,17 +19,30 @@ jobs:
       uses: docker/setup-qemu-action@v1
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
-    - name: Log in to the Container registry
+    - name: Log-in into GHCR
       uses: docker/login-action@v2
       with:
-        registry: ${{ env.REGISTRY }}
+        registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Log-in into Docker HUB
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
     - name: Build ubuntu-22.04 small cuda 11.7
       uses: docker/build-push-action@v2
       with:
         context: .
         platforms: linux/amd64
         push: true
-        tags: ghcr.io/cfd-go/tclb:ubuntu-22.04-cuda-11.7
+        tags: cfd-go/tclb:ubuntu-22.04-cuda-11.7 ghcr.io/cfd-go/tclb:ubuntu-22.04-cuda-11.7
         file: gen/Dockerfile.ubuntu-22.04-cuda-11.7 
+    - name: Build ubuntu-22.04 big cpu 
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        platforms: linux/amd64
+        push: true
+        tags: cfd-go/tclb:ubuntu-22.04-big ghcr.io/cfd-go/tclb:ubuntu-22.04-big
+        file: gen/Dockerfile.ubuntu-22.04-big 
diff --git a/generate.Rt b/generate.Rt
index 590b9c2..23af291 100644
--- a/generate.Rt
+++ b/generate.Rt
@@ -1,7 +1,7 @@
 <?R
     rows = function(x) lapply(seq_len(nrow(x)),function(i) lapply(x,"[[",i))
 
-    reg_repo = "ghcr.io/CFD-GO/TCLB"
+    reg_repo = c("cfd-go/tclb", "ghcr.io/cfd-go/tclb")
 
     tab = rbind(
         expand.grid(arch=c("cuda"), version=c("11.7","12.0")),
@@ -83,20 +83,25 @@ jobs:
       uses: docker/setup-qemu-action@v1
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
-    - name: Log in to the Container registry
+    - name: Log-in into GHCR
       uses: docker/login-action@v2
       with:
-        registry: ${{ env.REGISTRY }}
+        registry: ghcr.io
         username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}<?R
-  for (d in rows(tab)[1]) { ?>
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Log-in into Docker HUB
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}<?R
+  for (d in rows(tab)[c(1,10)]) { ?>
     - name: Build <?%s d$name ?>
       uses: docker/build-push-action@v2
       with:
         context: .
         platforms: linux/amd64
         push: true
-        tags: <?%s tolower(reg_repo) ?>:<?%s d$tag ?>
+        tags: <?%s paste(reg_repo,d$tag,sep=":",collapse=" ") ?>
         file: <?%s d$dockerfile ?> <?R
   } ?>
 <?R