From e923a7e4375d968f8e7bb05c1f97fcc83092f841 Mon Sep 17 00:00:00 2001
From: Shen Teng <sheteng@amazon.com>
Date: Thu, 19 Dec 2024 21:49:44 +0000
Subject: [PATCH 01/13] enable individual docker image build

---
 .github/workflows/docker-nightly-publish.yml | 138 +++++++------------
 1 file changed, 47 insertions(+), 91 deletions(-)

diff --git a/.github/workflows/docker-nightly-publish.yml b/.github/workflows/docker-nightly-publish.yml
index 788632f59..1049045ba 100644
--- a/.github/workflows/docker-nightly-publish.yml
+++ b/.github/workflows/docker-nightly-publish.yml
@@ -7,6 +7,11 @@ on:
         description: 'release/nightly/temp, default is nightly'
         required: true
         default: 'nightly'
+      arch:
+        description: 'which images to build [ cpu, cpu-full, pytorch-inf2, pytorch-gpu, tensorrt-llm, lmi, aarch64]'
+        type: string
+        required: false
+        default: '["cpu", "cpu-full", "pytorch-inf2", "pytorch-gpu", "tensorrt-llm", "lmi", "aarch64"]'
   workflow_call:
     inputs:
       mode:
@@ -14,6 +19,11 @@ on:
         type: string
         required: true
         default: 'nightly'
+      arch:
+        description: 'which images to build [ cpu, cpu-full, pytorch-inf2, pytorch-gpu, tensorrt-llm, lmi, aarch64]'
+        type: string
+        required: false
+        default: '["cpu", "cpu-full", "pytorch-inf2", "pytorch-gpu", "tensorrt-llm", "lmi", "aarch64"]'
     outputs:
       djl_version:
         description: "djl version"
@@ -30,54 +40,13 @@ env:
 jobs:
   create-runners:
     runs-on: [ self-hosted, scheduler ]
+    strategy:
+      matrix:
+        arch: ${{ fromJson(inputs.arch) }}
     steps:
       - name: Create new CPU instance
-        id: create_cpu_1
-        run: |
-          cd /home/ubuntu/djl_benchmark_script/scripts
-          token=$( curl -X POST -H "Authorization: token ${{ secrets.ACTION_RUNNER_PERSONAL_TOKEN }}" \
-          https://api.github.com/repos/deepjavalibrary/djl-serving/actions/runners/registration-token \
-          --fail \
-          | jq '.token' | tr -d '"' )
-          ./start_instance.sh action_cpu $token djl-serving
-      - name: Create new CPU instance
-        id: create_cpu_2
-        run: |
-          cd /home/ubuntu/djl_benchmark_script/scripts
-          token=$( curl -X POST -H "Authorization: token ${{ secrets.ACTION_RUNNER_PERSONAL_TOKEN }}" \
-          https://api.github.com/repos/deepjavalibrary/djl-serving/actions/runners/registration-token \
-          --fail \
-          | jq '.token' | tr -d '"' )
-          ./start_instance.sh action_cpu $token djl-serving
-      - name: Create new CPU instance
-        id: create_cpu_3
-        run: |
-          cd /home/ubuntu/djl_benchmark_script/scripts
-          token=$( curl -X POST -H "Authorization: token ${{ secrets.ACTION_RUNNER_PERSONAL_TOKEN }}" \
-          https://api.github.com/repos/deepjavalibrary/djl-serving/actions/runners/registration-token \
-          --fail \
-          | jq '.token' | tr -d '"' )
-          ./start_instance.sh action_cpu $token djl-serving
-      - name: Create new CPU instance
-        id: create_cpu_4
-        run: |
-          cd /home/ubuntu/djl_benchmark_script/scripts
-          token=$( curl -X POST -H "Authorization: token ${{ secrets.ACTION_RUNNER_PERSONAL_TOKEN }}" \
-          https://api.github.com/repos/deepjavalibrary/djl-serving/actions/runners/registration-token \
-          --fail \
-          | jq '.token' | tr -d '"' )
-          ./start_instance.sh action_cpu $token djl-serving
-      - name: Create new CPU instance
-        id: create_cpu_5
-        run: |
-          cd /home/ubuntu/djl_benchmark_script/scripts
-          token=$( curl -X POST -H "Authorization: token ${{ secrets.ACTION_RUNNER_PERSONAL_TOKEN }}" \
-          https://api.github.com/repos/deepjavalibrary/djl-serving/actions/runners/registration-token \
-          --fail \
-          | jq '.token' | tr -d '"' )
-          ./start_instance.sh action_cpu $token djl-serving
-      - name: Create new CPU instance
-        id: create_cpu_6
+        if: matrix.arch != 'aarch64'
+        id: create_cpu
         run: |
           cd /home/ubuntu/djl_benchmark_script/scripts
           token=$( curl -X POST -H "Authorization: token ${{ secrets.ACTION_RUNNER_PERSONAL_TOKEN }}" \
@@ -85,8 +54,12 @@ jobs:
           --fail \
           | jq '.token' | tr -d '"' )
           ./start_instance.sh action_cpu $token djl-serving
+          instance_id=`grep "instance_id=" $GITHUB_OUTPUT | cut -d'=' -f2`
+          echo "instance_id_${{matrix.arch}}=$instance_id" >>"$GITHUB_OUTPUT"
+
       - name: Create Graviton instance
-        id: create_graviton_1
+        if: matrix.arch == 'aarch64'
+        id: create_graviton
         run: |
           cd /home/ubuntu/djl_benchmark_script/scripts
           token=$( curl -X POST -H "Authorization: token ${{ secrets.ACTION_RUNNER_PERSONAL_TOKEN }}" \
@@ -94,38 +67,27 @@ jobs:
           --fail \
           | jq '.token' | tr -d '"' )
           ./start_instance.sh action_graviton $token djl-serving
+          instance_id=`grep "instance_id=" $GITHUB_OUTPUT | cut -d'=' -f2`
+          echo "instance_id_${{matrix.arch}}=$instance_id" >>"$GITHUB_OUTPUT"
     outputs:
-      cpu_instance_id_1: ${{ steps.create_cpu_1.outputs.action_cpu_instance_id }}
-      cpu_instance_id_2: ${{ steps.create_cpu_2.outputs.action_cpu_instance_id }}
-      cpu_instance_id_3: ${{ steps.create_cpu_3.outputs.action_cpu_instance_id }}
-      cpu_instance_id_4: ${{ steps.create_cpu_4.outputs.action_cpu_instance_id }}
-      cpu_instance_id_5: ${{ steps.create_cpu_5.outputs.action_cpu_instance_id }}
-      cpu_instance_id_6: ${{ steps.create_cpu_6.outputs.action_cpu_instance_id }}
-      graviton_instance_id_1: ${{ steps.create_graviton_1.outputs.action_graviton_instance_id }}
+      instance_id_cpu: ${{ steps.create_cpu.outputs.instance_id_cpu }}
+      instance_id_cpu-full: ${{ steps.create_cpu.outputs.instance_id_cpu-full }}
+      instance_id_pytorch-inf2: ${{ steps.create_cpu.outputs.instance_id_pytorch-inf2 }}
+      instance_id_pytorch-gpu: ${{ steps.create_cpu.outputs.instance_id_pytorch-gpu }}
+      instance_id_tensorrt-llm: ${{ steps.create_cpu.outputs.instance_id_tensorrt-llm }}
+      instance_id_lmi: ${{ steps.create_cpu.outputs.instance_id_lmi }}
+      instance_id_aarch64: ${{ steps.create_cpu.outputs.instance_id_aarch64 }}
 
   nightly-build:
     needs: create-runners
+    timeout-minutes: 120
     strategy:
       fail-fast: false
       matrix:
-        containers:
-          - name: cpu
-            instance: cpu
-          - name: cpu-full
-            instance: cpu
-          - name: pytorch-inf2
-            instance: cpu
-          - name: pytorch-gpu
-            instance: cpu
-          - name: tensorrt-llm
-            instance: cpu
-          - name: lmi
-            instance: cpu
-          - name: aarch64
-            instance: aarch64
+        arch: ${{ fromJson(inputs.arch) }}
     runs-on:
       - self-hosted
-      - ${{ matrix.containers.instance }}
+      - instance_id_${{ matrix.arch }}
       - RUN_ID-${{ github.run_id }}
       - RUN_NUMBER-${{ github.run_number }}
       - SHA-${{ github.sha }}
@@ -174,7 +136,7 @@ jobs:
           docker compose build --no-cache \
           --build-arg djl_version=${{ env.DJL_VERSION }} \
           --build-arg djl_serving_version=${{ env.SERVING_VERSION }} \
-          ${{  matrix.containers.name }}
+          ${{  matrix.arch }}
       - name: Build temp docker image
         if: ${{ inputs.mode == '' || inputs.mode == 'temp' || inputs.mode == 'nightly' }}
         run: |
@@ -185,7 +147,7 @@ jobs:
           docker compose build --no-cache \
           --build-arg djl_version=${{ env.DJL_VERSION }}-SNAPSHOT \
           --build-arg djl_serving_version=${{ env.SERVING_VERSION }}-SNAPSHOT \
-          ${{  matrix.containers.name }}
+          ${{   matrix.arch }}
       - name: Tag and push temp image to ECR repo
         working-directory: serving/docker
         run: |
@@ -195,13 +157,13 @@ jobs:
           if [ "${{ inputs.mode }}" == "release" ]; then
             mode=${{ env.DJL_VERSION }}
           fi
-          tempRunIdTag="${{ env.AWS_ECR_REPO }}:${{ matrix.containers.name }}-$mode-${GITHUB_RUN_ID}"
-          tempCommitTag="${{ env.AWS_ECR_REPO }}:${{  matrix.containers.name }}-$mode-${GITHUB_SHA}"
+          tempRunIdTag="${{ env.AWS_ECR_REPO }}:${{ matrix.arch }}-$mode-${GITHUB_RUN_ID}"
+          tempCommitTag="${{ env.AWS_ECR_REPO }}:${{ matrix.arch }}-$mode-${GITHUB_SHA}"
 
-          docker tag ${{ env.DOCKER_HUB_REPO }}:${{ matrix.containers.name }}${{ env.NIGHTLY }} $tempRunIdTag
-          docker tag ${{ env.DOCKER_HUB_REPO }}:${{  matrix.containers.name }}${{ env.NIGHTLY }} $tempCommitTag
+          docker tag ${{ env.DOCKER_HUB_REPO }}:${{ matrix.arch }}${{ env.NIGHTLY }} $tempRunIdTag
+          docker tag ${{ env.DOCKER_HUB_REPO }}:${{  matrix.arch }}${{ env.NIGHTLY }} $tempCommitTag
           if ${{ inputs.mode == 'nightly' }}; then
-            docker tag ${{ env.DOCKER_HUB_REPO }}:${{  matrix.containers.name }}${{ env.NIGHTLY }} ${{ env.AWS_ECR_REPO }}:${{  matrix.containers.name }}-nightly
+            docker tag ${{ env.DOCKER_HUB_REPO }}:${{ matrix.arch }}${{ env.NIGHTLY }} ${{ env.AWS_ECR_REPO }}:${{ matrix.arch }}-nightly
           fi
           time docker push --all-tags  ${{ env.AWS_ECR_REPO }}
 
@@ -209,21 +171,15 @@ jobs:
     if: always()
     runs-on: [ self-hosted, scheduler ]
     needs: [nightly-build, create-runners]
+    env:
+      runner_output: ${{ toJson(needs.create-runners.outputs) }}
     steps:
       - name: Stop all instances
+        continue-on-error: true
         run: |
           cd /home/ubuntu/djl_benchmark_script/scripts
-          instance_id=${{ needs.create-runners.outputs.cpu_instance_id_1 }}
-          ./stop_instance.sh $instance_id
-          instance_id=${{ needs.create-runners.outputs.cpu_instance_id_2 }}
-          ./stop_instance.sh $instance_id
-          instance_id=${{ needs.create-runners.outputs.cpu_instance_id_3 }}
-          ./stop_instance.sh $instance_id
-          instance_id=${{ needs.create-runners.outputs.cpu_instance_id_4 }}
-          ./stop_instance.sh $instance_id
-          instance_id=${{ needs.create-runners.outputs.cpu_instance_id_5 }}
-          ./stop_instance.sh $instance_id
-          instance_id=${{ needs.create-runners.outputs.cpu_instance_id_6 }}
-          ./stop_instance.sh $instance_id
-          instance_id=${{ needs.create-runners.outputs.graviton_instance_id_1 }}
-          ./stop_instance.sh $instance_id
+          for key in $(echo $runner_output | jq -r 'keys[]'); do
+            instance_id=$(echo $runner_output | jq -r ".$key")
+            echo "Key: $key, instance_id: $instance_id"
+            ./stop_instance.sh $instance_id
+          done
\ No newline at end of file

From 7729be7cc29b240f7a4193814b49e4f88620f028 Mon Sep 17 00:00:00 2001
From: Shen Teng <sheteng@amazon.com>
Date: Thu, 19 Dec 2024 21:53:35 +0000
Subject: [PATCH 02/13]  fix

---
 .github/workflows/docker-nightly-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-nightly-publish.yml b/.github/workflows/docker-nightly-publish.yml
index 1049045ba..18ea4aef6 100644
--- a/.github/workflows/docker-nightly-publish.yml
+++ b/.github/workflows/docker-nightly-publish.yml
@@ -67,7 +67,7 @@ jobs:
           --fail \
           | jq '.token' | tr -d '"' )
           ./start_instance.sh action_graviton $token djl-serving
-          instance_id=`grep "instance_id=" $GITHUB_OUTPUT | cut -d'=' -f2`
+          instance_id=`grep "^instance_id=" $GITHUB_OUTPUT | cut -d'=' -f2`
           echo "instance_id_${{matrix.arch}}=$instance_id" >>"$GITHUB_OUTPUT"
     outputs:
       instance_id_cpu: ${{ steps.create_cpu.outputs.instance_id_cpu }}

From de964280739d74da90620ec448ee119b21f58bf4 Mon Sep 17 00:00:00 2001
From: Shen Teng <sheteng@amazon.com>
Date: Thu, 19 Dec 2024 22:18:03 +0000
Subject: [PATCH 03/13]  fix

---
 .github/workflows/docker-nightly-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-nightly-publish.yml b/.github/workflows/docker-nightly-publish.yml
index 18ea4aef6..f070ccef2 100644
--- a/.github/workflows/docker-nightly-publish.yml
+++ b/.github/workflows/docker-nightly-publish.yml
@@ -54,7 +54,7 @@ jobs:
           --fail \
           | jq '.token' | tr -d '"' )
           ./start_instance.sh action_cpu $token djl-serving
-          instance_id=`grep "instance_id=" $GITHUB_OUTPUT | cut -d'=' -f2`
+          instance_id=`grep "^instance_id=" $GITHUB_OUTPUT | cut -d'=' -f2`
           echo "instance_id_${{matrix.arch}}=$instance_id" >>"$GITHUB_OUTPUT"
 
       - name: Create Graviton instance

From c40fae1af3637a06de12212fe7c0841d6caa2051 Mon Sep 17 00:00:00 2001
From: Shen Teng <sheteng@amazon.com>
Date: Thu, 19 Dec 2024 22:52:55 +0000
Subject: [PATCH 04/13] fix

---
 .github/workflows/docker-nightly-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-nightly-publish.yml b/.github/workflows/docker-nightly-publish.yml
index f070ccef2..7574bbc67 100644
--- a/.github/workflows/docker-nightly-publish.yml
+++ b/.github/workflows/docker-nightly-publish.yml
@@ -87,7 +87,7 @@ jobs:
         arch: ${{ fromJson(inputs.arch) }}
     runs-on:
       - self-hosted
-      - instance_id_${{ matrix.arch }}
+      - ${{ inputs.arch != 'aarch64' && 'cpu' || 'aarch64' }}
       - RUN_ID-${{ github.run_id }}
       - RUN_NUMBER-${{ github.run_number }}
       - SHA-${{ github.sha }}

From 220383802257fccc2e89ae1e5b32c69aa68e905d Mon Sep 17 00:00:00 2001
From: Shen Teng <sheteng@amazon.com>
Date: Thu, 19 Dec 2024 23:34:12 +0000
Subject: [PATCH 05/13] fix stop

---
 .github/workflows/docker-nightly-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-nightly-publish.yml b/.github/workflows/docker-nightly-publish.yml
index 7574bbc67..9084475ca 100644
--- a/.github/workflows/docker-nightly-publish.yml
+++ b/.github/workflows/docker-nightly-publish.yml
@@ -179,7 +179,7 @@ jobs:
         run: |
           cd /home/ubuntu/djl_benchmark_script/scripts
           for key in $(echo $runner_output | jq -r 'keys[]'); do
-            instance_id=$(echo $runner_output | jq -r ".$key")
+            instance_id=$(echo $runner_output | jq -r ".[\"$key\"]")
             echo "Key: $key, instance_id: $instance_id"
             ./stop_instance.sh $instance_id
           done
\ No newline at end of file

From d0c974c208674e0e94bd35b3a05df2c8c69c25d8 Mon Sep 17 00:00:00 2001
From: Shen Teng <sheteng@amazon.com>
Date: Thu, 19 Dec 2024 23:54:51 +0000
Subject: [PATCH 06/13] fix runs on

---
 .github/workflows/docker-nightly-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-nightly-publish.yml b/.github/workflows/docker-nightly-publish.yml
index 9084475ca..076e5f66c 100644
--- a/.github/workflows/docker-nightly-publish.yml
+++ b/.github/workflows/docker-nightly-publish.yml
@@ -87,7 +87,7 @@ jobs:
         arch: ${{ fromJson(inputs.arch) }}
     runs-on:
       - self-hosted
-      - ${{ inputs.arch != 'aarch64' && 'cpu' || 'aarch64' }}
+      - ${{ matrix.arch != 'aarch64' && 'cpu' || 'aarch64' }}
       - RUN_ID-${{ github.run_id }}
       - RUN_NUMBER-${{ github.run_number }}
       - SHA-${{ github.sha }}

From 3045a0d9556dcfd8bf568fab3feac64bcef6bd86 Mon Sep 17 00:00:00 2001
From: Shen Teng <sheteng@amazon.com>
Date: Fri, 20 Dec 2024 00:38:32 +0000
Subject: [PATCH 07/13] merge

---
 .github/workflows/docker-nightly-publish.yml | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/docker-nightly-publish.yml b/.github/workflows/docker-nightly-publish.yml
index 076e5f66c..098ca0bf0 100644
--- a/.github/workflows/docker-nightly-publish.yml
+++ b/.github/workflows/docker-nightly-publish.yml
@@ -44,7 +44,7 @@ jobs:
       matrix:
         arch: ${{ fromJson(inputs.arch) }}
     steps:
-      - name: Create new CPU instance
+      - name: Create new instance
         if: matrix.arch != 'aarch64'
         id: create_cpu
         run: |
@@ -53,22 +53,14 @@ jobs:
           https://api.github.com/repos/deepjavalibrary/djl-serving/actions/runners/registration-token \
           --fail \
           | jq '.token' | tr -d '"' )
-          ./start_instance.sh action_cpu $token djl-serving
+          instance_type=action_cpu
+          if [ "${{matrix.arch}}" == "aarch64" ]; then
+            instance_type=action_graviton
+          fi
+          ./start_instance.sh $instance_type $token djl-serving
           instance_id=`grep "^instance_id=" $GITHUB_OUTPUT | cut -d'=' -f2`
           echo "instance_id_${{matrix.arch}}=$instance_id" >>"$GITHUB_OUTPUT"
 
-      - name: Create Graviton instance
-        if: matrix.arch == 'aarch64'
-        id: create_graviton
-        run: |
-          cd /home/ubuntu/djl_benchmark_script/scripts
-          token=$( curl -X POST -H "Authorization: token ${{ secrets.ACTION_RUNNER_PERSONAL_TOKEN }}" \
-          https://api.github.com/repos/deepjavalibrary/djl-serving/actions/runners/registration-token \
-          --fail \
-          | jq '.token' | tr -d '"' )
-          ./start_instance.sh action_graviton $token djl-serving
-          instance_id=`grep "^instance_id=" $GITHUB_OUTPUT | cut -d'=' -f2`
-          echo "instance_id_${{matrix.arch}}=$instance_id" >>"$GITHUB_OUTPUT"
     outputs:
       instance_id_cpu: ${{ steps.create_cpu.outputs.instance_id_cpu }}
       instance_id_cpu-full: ${{ steps.create_cpu.outputs.instance_id_cpu-full }}

From c63b64d9ca4497f02365e4b7ecce811e03777665 Mon Sep 17 00:00:00 2001
From: Shen Teng <sheteng@amazon.com>
Date: Fri, 20 Dec 2024 00:58:15 +0000
Subject: [PATCH 08/13] fix condition

---
 .github/workflows/docker-nightly-publish.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/docker-nightly-publish.yml b/.github/workflows/docker-nightly-publish.yml
index 098ca0bf0..2936b4e4f 100644
--- a/.github/workflows/docker-nightly-publish.yml
+++ b/.github/workflows/docker-nightly-publish.yml
@@ -45,7 +45,6 @@ jobs:
         arch: ${{ fromJson(inputs.arch) }}
     steps:
       - name: Create new instance
-        if: matrix.arch != 'aarch64'
         id: create_cpu
         run: |
           cd /home/ubuntu/djl_benchmark_script/scripts

From 8ed81b6062ba3da5f81009f2ebb1abbb747f7fcf Mon Sep 17 00:00:00 2001
From: Shen Teng <sheteng@amazon.com>
Date: Mon, 30 Dec 2024 19:11:14 +0000
Subject: [PATCH 09/13] test

---
 .github/workflows/docker-nightly-publish.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-nightly-publish.yml b/.github/workflows/docker-nightly-publish.yml
index 2936b4e4f..4ea384900 100644
--- a/.github/workflows/docker-nightly-publish.yml
+++ b/.github/workflows/docker-nightly-publish.yml
@@ -42,7 +42,7 @@ jobs:
     runs-on: [ self-hosted, scheduler ]
     strategy:
       matrix:
-        arch: ${{ fromJson(inputs.arch) }}
+        arch: ${{ startsWith(inputs.arch, '[') && fromJson(inputs.arch) || format('[{0}]', inputs.arch) }}
     steps:
       - name: Create new instance
         id: create_cpu
@@ -127,7 +127,7 @@ jobs:
           docker compose build --no-cache \
           --build-arg djl_version=${{ env.DJL_VERSION }} \
           --build-arg djl_serving_version=${{ env.SERVING_VERSION }} \
-          ${{  matrix.arch }}
+          ${{ matrix.arch }}
       - name: Build temp docker image
         if: ${{ inputs.mode == '' || inputs.mode == 'temp' || inputs.mode == 'nightly' }}
         run: |
@@ -138,7 +138,7 @@ jobs:
           docker compose build --no-cache \
           --build-arg djl_version=${{ env.DJL_VERSION }}-SNAPSHOT \
           --build-arg djl_serving_version=${{ env.SERVING_VERSION }}-SNAPSHOT \
-          ${{   matrix.arch }}
+          ${{ matrix.arch }}
       - name: Tag and push temp image to ECR repo
         working-directory: serving/docker
         run: |
@@ -152,7 +152,7 @@ jobs:
           tempCommitTag="${{ env.AWS_ECR_REPO }}:${{ matrix.arch }}-$mode-${GITHUB_SHA}"
 
           docker tag ${{ env.DOCKER_HUB_REPO }}:${{ matrix.arch }}${{ env.NIGHTLY }} $tempRunIdTag
-          docker tag ${{ env.DOCKER_HUB_REPO }}:${{  matrix.arch }}${{ env.NIGHTLY }} $tempCommitTag
+          docker tag ${{ env.DOCKER_HUB_REPO }}:${{ matrix.arch }}${{ env.NIGHTLY }} $tempCommitTag
           if ${{ inputs.mode == 'nightly' }}; then
             docker tag ${{ env.DOCKER_HUB_REPO }}:${{ matrix.arch }}${{ env.NIGHTLY }} ${{ env.AWS_ECR_REPO }}:${{ matrix.arch }}-nightly
           fi

From 7b0a740d5c61355318854ae2e362e9e8ea7b1417 Mon Sep 17 00:00:00 2001
From: Shen Teng <sheteng@amazon.com>
Date: Mon, 30 Dec 2024 19:13:15 +0000
Subject: [PATCH 10/13] try out single image

---
 .github/workflows/docker-nightly-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-nightly-publish.yml b/.github/workflows/docker-nightly-publish.yml
index 4ea384900..ec732cd59 100644
--- a/.github/workflows/docker-nightly-publish.yml
+++ b/.github/workflows/docker-nightly-publish.yml
@@ -42,7 +42,7 @@ jobs:
     runs-on: [ self-hosted, scheduler ]
     strategy:
       matrix:
-        arch: ${{ startsWith(inputs.arch, '[') && fromJson(inputs.arch) || format('[{0}]', inputs.arch) }}
+        arch: ${{ startsWith(inputs.arch, '[') && fromJson(inputs.arch) || format('["{0}"]', inputs.arch) }}
     steps:
       - name: Create new instance
         id: create_cpu

From 9c429a9d598257e3e1abe30d9c18cec6769e2dca Mon Sep 17 00:00:00 2001
From: Shen Teng <sheteng@amazon.com>
Date: Mon, 30 Dec 2024 19:14:00 +0000
Subject: [PATCH 11/13] try out single image

---
 .github/workflows/docker-nightly-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-nightly-publish.yml b/.github/workflows/docker-nightly-publish.yml
index ec732cd59..4ea384900 100644
--- a/.github/workflows/docker-nightly-publish.yml
+++ b/.github/workflows/docker-nightly-publish.yml
@@ -42,7 +42,7 @@ jobs:
     runs-on: [ self-hosted, scheduler ]
     strategy:
       matrix:
-        arch: ${{ startsWith(inputs.arch, '[') && fromJson(inputs.arch) || format('["{0}"]', inputs.arch) }}
+        arch: ${{ startsWith(inputs.arch, '[') && fromJson(inputs.arch) || format('[{0}]', inputs.arch) }}
     steps:
       - name: Create new instance
         id: create_cpu

From a7ba349470d8237b979352f00fc75126c1bb504d Mon Sep 17 00:00:00 2001
From: Shen Teng <sheteng@amazon.com>
Date: Mon, 30 Dec 2024 19:15:07 +0000
Subject: [PATCH 12/13] try out single image

---
 .github/workflows/docker-nightly-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-nightly-publish.yml b/.github/workflows/docker-nightly-publish.yml
index 4ea384900..833a27043 100644
--- a/.github/workflows/docker-nightly-publish.yml
+++ b/.github/workflows/docker-nightly-publish.yml
@@ -42,7 +42,7 @@ jobs:
     runs-on: [ self-hosted, scheduler ]
     strategy:
       matrix:
-        arch: ${{ startsWith(inputs.arch, '[') && fromJson(inputs.arch) || format('[{0}]', inputs.arch) }}
+        arch: ${{ startsWith(inputs.arch, '[') && fromJson(inputs.arch) || fromJson(format('[{0}]', inputs.arch)) }}
     steps:
       - name: Create new instance
         id: create_cpu

From a2a65d56c1b5c371315af4a543844ec19bb9724b Mon Sep 17 00:00:00 2001
From: Shen Teng <sheteng@amazon.com>
Date: Mon, 30 Dec 2024 19:17:29 +0000
Subject: [PATCH 13/13] try out single image

---
 .github/workflows/docker-nightly-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-nightly-publish.yml b/.github/workflows/docker-nightly-publish.yml
index 833a27043..eb2c212d9 100644
--- a/.github/workflows/docker-nightly-publish.yml
+++ b/.github/workflows/docker-nightly-publish.yml
@@ -75,7 +75,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: ${{ fromJson(inputs.arch) }}
+        arch: ${{ startsWith(inputs.arch, '[') && fromJson(inputs.arch) || fromJson(format('[{0}]', inputs.arch)) }}
     runs-on:
       - self-hosted
       - ${{ matrix.arch != 'aarch64' && 'cpu' || 'aarch64' }}