update docker build target platform selection rules (#2370) (#2374)

Signed-off-by: kpango <[email protected]> Co-authored-by: Yusuke Kato <[email protected]> Co-authored-by: Yusuke Kadowaki <[email protected]>
vdaas · Feb 16, 2024 · 52dfbd9 · 52dfbd9
1 parent 1326e72
commit 52dfbd9
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/.github/actions/docker-build/action.yaml b/.github/actions/docker-build/action.yaml
@@ -68,7 +68,9 @@ runs:
       id: determine_platforms
       run: |
         if [ "${TARGET_PLATFORMS}" = "" ]; then
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
+          if [[ "$GITHUB_REF" =~ ^refs/heads/main$ ]] || [[ "$GITHUB_REF" =~ ^refs/heads/master$ ]] || [[ "$GITHUB_REF" =~ ^refs/heads/release.* ]] || [[ "${PRIMARY_TAG}" == "nightly" ]]; then
+            platforms=`make docker/platforms`
+          elif [ "${{ github.event_name }}" = "pull_request" ]; then
             platforms="linux/amd64"
           elif [ "${{ github.event_name }}" = "pull_request_target" ]; then
             platforms="linux/amd64"

diff --git a/.github/workflows/dockers-agent-ngt-image.yml b/.github/workflows/dockers-agent-ngt-image.yml
@@ -80,5 +80,4 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: agent-ngt
-      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-benchmark-job-image.yml b/.github/workflows/dockers-benchmark-job-image.yml
@@ -78,5 +78,4 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: benchmark-job
-      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-helm-operator-image.yml b/.github/workflows/dockers-helm-operator-image.yml
@@ -68,5 +68,4 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: operator/helm
-      platforms: linux/amd64,linux/arm64
     secrets: inherit