From 1eb71f6af6fb8b590dfc1ce1a8401d1fd2b6140f Mon Sep 17 00:00:00 2001
From: "Christian M. Todie" <ctodie@coreweave.com>
Date: Thu, 20 Jul 2023 11:47:24 -0400
Subject: [PATCH] ci(build): Add DockerHub login and secret inheritence

---
 .github/workflows/bloom.yml               |  5 +++--
 .github/workflows/build.yml               | 18 ++++++++++++------
 .github/workflows/cuda-ssh.yml            |  1 +
 .github/workflows/gpt-neox-determined.yml |  5 +++--
 .github/workflows/gpt-neox-mpi.yml        |  1 +
 .github/workflows/sd-finetuner.yml        |  5 +++--
 .github/workflows/sd-inference.yml        |  5 +++--
 .github/workflows/sd-serializer.yml       |  5 +++--
 .github/workflows/slurm.yml               |  3 ++-
 .github/workflows/tensorizer.yml          |  5 +++--
 .github/workflows/torch-base.yml          |  1 +
 .github/workflows/torch-extras.yml        |  1 +
 .github/workflows/torch-nccl.yml          |  1 +
 .github/workflows/torch.yml               |  2 ++
 14 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/bloom.yml b/.github/workflows/bloom.yml
index 1aeaa41..8e169ff 100644
--- a/.github/workflows/bloom.yml
+++ b/.github/workflows/bloom.yml
@@ -10,7 +10,8 @@ on:
 jobs:
   build:
     uses: ./.github/workflows/build.yml
-    with: 
+    secrets: inherit
+    with:
       image-name: bloom
       folder: bloom
-      build-args: ""
\ No newline at end of file
+      build-args: ""
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7eb4616..1c376ae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,12 +38,17 @@ jobs:
       - uses: actions/checkout@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2.2.1
-      - name: Login to container registry
-        uses: docker/login-action@v2.1.0
+      - name: Login to GitHub container registry
+        uses: docker/login-action@v2.2.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Login to DockerHub container registry
+        uses: docker/login-action@v2.2.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
       - name: Get base registry
         run: |
           echo "REGISTRY=ghcr.io/${GITHUB_REPOSITORY,,}" >> $GITHUB_ENV
@@ -67,7 +72,8 @@ jobs:
         uses: docker/build-push-action@v3.2.0
         with:
           context: ${{ inputs.folder }}
-          build-args: ${{ inputs.build-args }}
+          build-args: |-
+            ${{ inputs.build-args }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -80,10 +86,10 @@ jobs:
       - name: Comment
         if: steps.PR.outputs.number
         uses: peter-evans/create-or-update-comment@v2.1.0
-        with: 
+        with:
           issue-number: ${{ steps.PR.outputs.number }}
           body: >
-            @${{ github.triggering_actor }} Build complete, ${{ steps.docker-build.outcome }}: 
+            @${{ github.triggering_actor }} Build complete, ${{ steps.docker-build.outcome }}:
             ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
-            Image: `${{ fromJSON(steps.docker-build.outputs.metadata)['image.name'] }}`
\ No newline at end of file
+            Image: `${{ fromJSON(steps.docker-build.outputs.metadata)['image.name'] }}`
diff --git a/.github/workflows/cuda-ssh.yml b/.github/workflows/cuda-ssh.yml
index 892e6c3..6ba26ea 100644
--- a/.github/workflows/cuda-ssh.yml
+++ b/.github/workflows/cuda-ssh.yml
@@ -16,6 +16,7 @@ jobs:
           - ceeb8c2-nccl-cuda11.8.0-nccl2.16.2-1-torch2.0.1-vision0.15.2-audio2.0.2
 
     uses: ./.github/workflows/build.yml
+    secrets: inherit
     with:
       image-name: cuda-ssh
       folder: cuda-ssh
diff --git a/.github/workflows/gpt-neox-determined.yml b/.github/workflows/gpt-neox-determined.yml
index 2ae03f7..4e0a6f4 100644
--- a/.github/workflows/gpt-neox-determined.yml
+++ b/.github/workflows/gpt-neox-determined.yml
@@ -10,7 +10,8 @@ on:
 jobs:
   build:
     uses: ./.github/workflows/build.yml
-    with: 
+    secrets: inherit
+    with:
       image-name: gpt-neox-determined
       folder: gpt-neox-determined
-      build-args: ""
\ No newline at end of file
+      build-args: ""
diff --git a/.github/workflows/gpt-neox-mpi.yml b/.github/workflows/gpt-neox-mpi.yml
index f2c6c0c..aec2a5f 100644
--- a/.github/workflows/gpt-neox-mpi.yml
+++ b/.github/workflows/gpt-neox-mpi.yml
@@ -10,6 +10,7 @@ on:
 jobs:
   build:
     uses: ./.github/workflows/build.yml
+    secrets: inherit
     with:
       image-name: gpt-neox-mpi
       folder: gpt-neox-mpi
diff --git a/.github/workflows/sd-finetuner.yml b/.github/workflows/sd-finetuner.yml
index 165a2a5..6e6203c 100644
--- a/.github/workflows/sd-finetuner.yml
+++ b/.github/workflows/sd-finetuner.yml
@@ -15,7 +15,8 @@ on:
 jobs:
   build:
     uses: ./.github/workflows/build.yml
-    with: 
+    secrets: inherit
+    with:
       image-name: sd-finetuner
       folder: sd-finetuner
-      build-args: "--build-arg COMMIT=${{ github.event.inputs.commit }}"
\ No newline at end of file
+      build-args: "--build-arg COMMIT=${{ github.event.inputs.commit }}"
diff --git a/.github/workflows/sd-inference.yml b/.github/workflows/sd-inference.yml
index 06d9052..22167bb 100644
--- a/.github/workflows/sd-inference.yml
+++ b/.github/workflows/sd-inference.yml
@@ -15,7 +15,8 @@ on:
 jobs:
   build:
     uses: ./.github/workflows/build.yml
-    with: 
+    secrets: inherit
+    with:
       image-name: sd-inference
       folder: sd-inference
-      build-args: "--build-arg COMMIT=${{ github.event.inputs.commit }}"
\ No newline at end of file
+      build-args: "--build-arg COMMIT=${{ github.event.inputs.commit }}"
diff --git a/.github/workflows/sd-serializer.yml b/.github/workflows/sd-serializer.yml
index e964807..fc11bfa 100644
--- a/.github/workflows/sd-serializer.yml
+++ b/.github/workflows/sd-serializer.yml
@@ -15,7 +15,8 @@ on:
 jobs:
   build:
     uses: ./.github/workflows/build.yml
-    with: 
+    secrets: inherit
+    with:
       image-name: sd-serializer
       folder: sd-serializer
-      build-args: "--build-arg COMMIT=${{ github.event.inputs.commit }}"
\ No newline at end of file
+      build-args: "--build-arg COMMIT=${{ github.event.inputs.commit }}"
diff --git a/.github/workflows/slurm.yml b/.github/workflows/slurm.yml
index fef7d0a..1c63a49 100644
--- a/.github/workflows/slurm.yml
+++ b/.github/workflows/slurm.yml
@@ -21,7 +21,8 @@ jobs:
             BASE_IMAGE=registry.gitlab.com/coreweave/sunk/slurmd-cw-cu117-extras:bc5a133d
 
     uses: ./.github/workflows/build.yml
-    with: 
+    secrets: inherit
+    with:
       image-name: ${{ matrix.image.name }}
       folder: ${{ matrix.image.folder }}
       build-args: ${{ matrix.image.build-args }}
diff --git a/.github/workflows/tensorizer.yml b/.github/workflows/tensorizer.yml
index 5778b9b..a9a870f 100644
--- a/.github/workflows/tensorizer.yml
+++ b/.github/workflows/tensorizer.yml
@@ -15,7 +15,8 @@ on:
 jobs:
   build:
     uses: ./.github/workflows/build.yml
-    with: 
+    secrets: inherit
+    with:
       image-name: tensorizer
       folder: tensorizer
-      build-args: "--build-arg COMMIT=${{ github.event.inputs.commit }}"
\ No newline at end of file
+      build-args: "--build-arg COMMIT=${{ github.event.inputs.commit }}"
diff --git a/.github/workflows/torch-base.yml b/.github/workflows/torch-base.yml
index 64b3af9..1aedab9 100644
--- a/.github/workflows/torch-base.yml
+++ b/.github/workflows/torch-base.yml
@@ -19,6 +19,7 @@ jobs:
             audio: 2.0.2
 
     uses: ./.github/workflows/torch.yml
+    secrets: inherit
     with:
       tag: ${{ format('base-cuda{0}-torch{1}-vision{2}-audio{3}', matrix.cuda, matrix.torch, matrix.vision, matrix.audio) }}
       builder-base-image: nvidia/cuda:${{ matrix.cuda }}-devel-ubuntu20.04
diff --git a/.github/workflows/torch-extras.yml b/.github/workflows/torch-extras.yml
index 9892af2..a9460b5 100644
--- a/.github/workflows/torch-extras.yml
+++ b/.github/workflows/torch-extras.yml
@@ -21,6 +21,7 @@ on:
 jobs:
   build:
     uses: ./.github/workflows/build.yml
+    secrets: inherit
     with:
       image-name: torch-extras
       folder: torch-extras
diff --git a/.github/workflows/torch-nccl.yml b/.github/workflows/torch-nccl.yml
index fb84489..a0660b6 100644
--- a/.github/workflows/torch-nccl.yml
+++ b/.github/workflows/torch-nccl.yml
@@ -28,6 +28,7 @@ jobs:
             audio: 2.0.2
 
     uses: ./.github/workflows/torch.yml
+    secrets: inherit
     with:
       tag: ${{ format('nccl-cuda{0}-nccl{1}-torch{2}-vision{3}-audio{4}', matrix.image.cuda, matrix.image.nccl, matrix.torch, matrix.vision, matrix.audio) }}
       builder-base-image: ghcr.io/coreweave/nccl-tests:${{ matrix.image.cuda }}-cudnn8-devel-ubuntu20.04-nccl${{ matrix.image.nccl }}-${{ matrix.image.nccl-tests-hash }}
diff --git a/.github/workflows/torch.yml b/.github/workflows/torch.yml
index f2b553a..681cf06 100644
--- a/.github/workflows/torch.yml
+++ b/.github/workflows/torch.yml
@@ -60,6 +60,7 @@ on:
 jobs:
   build:
     uses: ./.github/workflows/build.yml
+    secrets: inherit
     with:
       image-name: torch
       folder: torch
@@ -76,6 +77,7 @@ jobs:
     if: inputs.build-extras
     needs: build
     uses: ./.github/workflows/torch-extras.yml
+    secrets: inherit
     with:
       tag: ${{ inputs.tag }}
       base-image: ${{ needs.build.outputs.tags }}