From ce8ba2d01da84d46e5a3998ede76b5045bc5fbac Mon Sep 17 00:00:00 2001
From: Yu-Hang Maxin Tang <Tang.Maxin@gmail.com>
Date: Thu, 16 Nov 2023 13:39:55 +0000
Subject: [PATCH 1/2] use the _publish_container reusable workflow for base
 container weekly build

---
 .github/workflows/weekly-base-build.yaml | 61 +++++++-----------------
 1 file changed, 17 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/weekly-base-build.yaml b/.github/workflows/weekly-base-build.yaml
index ed661e801..71a589124 100644
--- a/.github/workflows/weekly-base-build.yaml
+++ b/.github/workflows/weekly-base-build.yaml
@@ -12,10 +12,6 @@ on:
         default: false
         required: false
 
-env:
-  DOCKER_REGISTRY: ghcr.io/nvidia
-  DOCKER_IMAGE: jax-toolbox
-
 permissions:
   contents: read  # to fetch code
   actions:  write # to cancel previous workflows
@@ -27,6 +23,7 @@ jobs:
     runs-on: ubuntu-22.04
     outputs:
       BUILD_DATE: ${{ steps.date.outputs.BUILD_DATE }}
+      PUBLISH: ${{ steps.if-publish.outputs.PUBLISH }}
     steps:
       - name: Set build date
         id: date
@@ -34,6 +31,12 @@ jobs:
         run: |
           BUILD_DATE=$(TZ='US/Los_Angeles' date '+%Y-%m-%d')
           echo "BUILD_DATE=${BUILD_DATE}" >> $GITHUB_OUTPUT
+      
+      - name: Determine whether results will be 'published'
+        id: if-publish
+        shell: bash -x -e {0}
+        run: |
+          echo "PUBLISH=${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.PUBLISH) }}" >> $GITHUB_OUTPUT
 
   amd64:
     needs: metadata
@@ -52,47 +55,17 @@ jobs:
     secrets: inherit
 
   publish:
-    if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.PUBLISH)
-    runs-on: ubuntu-latest
     needs: [metadata, amd64, arm64]
-    steps:
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set docker metadata
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}
-          flavor: |
-            latest=false
-          tags: |
-            type=raw,value=base,priority=1000
-            type=raw,value=base-${{ needs.metadata.outputs.BUILD_DATE }},priority=900
-          labels:
-            org.opencontainers.image.created=${{ needs.metadata.outputs.BUILD_DATE }}
-
-      - name: Combine images into a single multi-arch image
-        shell: bash -x -e {0}
-        run: |
-          for tag in $(echo "${{ steps.meta.outputs.tags }}"); do
-            docker manifest create ${tag} $(
-              for IMAGE in ${{ needs.amd64.outputs.DOCKER_TAG }} ${{ needs.arm64.outputs.DOCKER_TAG }}; do
-                REPO=$(echo $IMAGE | cut -d: -f1)
-                DIGEST=$(
-                  docker manifest inspect $IMAGE |\
-                  jq -r '.manifests[] | select(.platform.os == "linux") | .digest'
-                )
-                echo $REPO@${DIGEST}
-              done
-            )
-            docker manifest push ${tag}
-          done
+    if: needs.metadata.outputs.PUBLISH == 'true'
+    uses: ./.github/workflows/_publish_container.yaml
+    with:
+      SOURCE_IMAGE: |
+        ${{ needs.amd64.outputs.DOCKER_TAG }}
+        ${{ needs.arm64.outputs.DOCKER_TAG }}
+      TARGET_IMAGE: jax-toolbox
+      TARGET_TAGS: |
+        type=raw,value=base,priority=1000
+        type=raw,value=base-${{ needs.metadata.outputs.BUILD_DATE }},priority=900
 
   finalize:
     if: always()

From 6501ae905fad29b4869eba7c7a1f749b088cf616 Mon Sep 17 00:00:00 2001
From: Yu-Hang Maxin Tang <Tang.Maxin@gmail.com>
Date: Thu, 16 Nov 2023 13:46:05 +0000
Subject: [PATCH 2/2] fix base build output arg name error

---
 .github/workflows/_ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/_ci.yaml b/.github/workflows/_ci.yaml
index 1447f5076..801e7299a 100644
--- a/.github/workflows/_ci.yaml
+++ b/.github/workflows/_ci.yaml
@@ -31,7 +31,7 @@ on:
     outputs:
       TAG_BASE:
         description: "Tags of the base image built"
-        value: ${{ jobs.build-base.outputs.DOCKER_TAGS }}
+        value: ${{ jobs.build-base.outputs.DOCKER_TAG }}
       TAG_JAX:
         description: "Tags of the JAX image built"
         value: ${{ jobs.build-jax.outputs.DOCKER_TAG_FINAL }}