fix

kpango · kpango · commit a9725c258ae4 · 2025-01-16T17:25:33.000+09:00
Signed-off-by: kpango &lt;kpango@vdaas.org&gt;
diff --git a/.github/workflows/dockers-agent-faiss-image.yaml b/.github/workflows/dockers-agent-faiss-image.yaml
@@ -265,4 +265,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: agent-faiss
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-agent-image.yaml b/.github/workflows/dockers-agent-image.yaml
@@ -71,4 +71,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: agent
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-agent-ngt-image.yaml b/.github/workflows/dockers-agent-ngt-image.yaml
@@ -269,4 +269,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: agent-ngt
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-agent-sidecar-image.yaml b/.github/workflows/dockers-agent-sidecar-image.yaml
@@ -295,4 +295,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: agent-sidecar
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-benchmark-job-image.yaml b/.github/workflows/dockers-benchmark-job-image.yaml
@@ -261,4 +261,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: benchmark-job
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-benchmark-operator-image.yaml b/.github/workflows/dockers-benchmark-operator-image.yaml
@@ -255,4 +255,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: benchmark-operator
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-dev-container-image.yaml b/.github/workflows/dockers-dev-container-image.yaml
@@ -55,4 +55,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: dev-container
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-discoverer-k8s-image.yaml b/.github/workflows/dockers-discoverer-k8s-image.yaml
@@ -259,4 +259,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: discoverer-k8s
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-example-client-image.yaml b/.github/workflows/dockers-example-client-image.yaml
@@ -65,4 +65,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: example-client
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-gateway-filter-image.yaml b/.github/workflows/dockers-gateway-filter-image.yaml
@@ -259,4 +259,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: gateway-filter
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-gateway-lb-image.yaml b/.github/workflows/dockers-gateway-lb-image.yaml
@@ -257,4 +257,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: gateway-lb
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-gateway-mirror-image.yaml b/.github/workflows/dockers-gateway-mirror-image.yaml
@@ -261,4 +261,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: gateway-mirror
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-helm-operator-image.yaml b/.github/workflows/dockers-helm-operator-image.yaml
@@ -65,4 +65,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: helm-operator
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-index-correction-image.yaml b/.github/workflows/dockers-index-correction-image.yaml
@@ -249,4 +249,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: index-correction
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-index-creation-image.yaml b/.github/workflows/dockers-index-creation-image.yaml
@@ -243,4 +243,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: index-creation
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-index-deletion-image.yaml b/.github/workflows/dockers-index-deletion-image.yaml
@@ -243,4 +243,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: index-deletion
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-index-operator-image.yaml b/.github/workflows/dockers-index-operator-image.yaml
@@ -241,4 +241,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: index-operator
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-index-save-image.yaml b/.github/workflows/dockers-index-save-image.yaml
@@ -243,4 +243,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: index-save
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-manager-index-image.yaml b/.github/workflows/dockers-manager-index-image.yaml
@@ -263,4 +263,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: manager-index
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/.github/workflows/dockers-readreplica-rotate-image.yaml b/.github/workflows/dockers-readreplica-rotate-image.yaml
@@ -239,4 +239,5 @@ jobs:
     uses: ./.github/workflows/_docker-image.yaml
     with:
       target: readreplica-rotate
+      platforms: linux/amd64,linux/arm64
     secrets: inherit
diff --git a/dockers/agent/core/agent/Dockerfile b/dockers/agent/core/agent/Dockerfile
@@ -94,4 +94,4 @@ LABEL maintainer="vdaas.org vald team <vald@vdaas.org>"
 COPY --from=builder /usr/bin/agent /usr/bin/agent
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/agent"]
+ENTRYPOINT ["/usr/bin/agent"]
diff --git a/dockers/agent/core/faiss/Dockerfile b/dockers/agent/core/faiss/Dockerfile
@@ -96,4 +96,4 @@ COPY --from=builder /usr/bin/faiss /usr/bin/faiss
 COPY cmd/agent/core/faiss/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/faiss"]
+ENTRYPOINT ["/usr/bin/faiss"]
diff --git a/dockers/agent/core/ngt/Dockerfile b/dockers/agent/core/ngt/Dockerfile
@@ -95,4 +95,4 @@ COPY --from=builder /usr/bin/ngt /usr/bin/ngt
 COPY cmd/agent/core/ngt/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/ngt"]
+ENTRYPOINT ["/usr/bin/ngt"]
diff --git a/dockers/agent/sidecar/Dockerfile b/dockers/agent/sidecar/Dockerfile
@@ -85,4 +85,4 @@ LABEL maintainer="vdaas.org vald team <vald@vdaas.org>"
 COPY --from=builder /usr/bin/sidecar /usr/bin/sidecar
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/sidecar"]
+ENTRYPOINT ["/usr/bin/sidecar"]
diff --git a/dockers/binfmt/Dockerfile b/dockers/binfmt/Dockerfile
@@ -17,4 +17,4 @@
 #
 
 # DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go
-FROM tonistiigi/binfmt:master AS builder
+FROM tonistiigi/binfmt:master AS builder
diff --git a/dockers/buildbase/Dockerfile b/dockers/buildbase/Dockerfile
@@ -17,4 +17,4 @@
 #
 
 # DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go
-FROM ubuntu:devel AS builder
+FROM ubuntu:devel AS builder
diff --git a/dockers/buildkit/Dockerfile b/dockers/buildkit/Dockerfile
@@ -17,4 +17,4 @@
 #
 
 # DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go
-FROM moby/buildkit:master AS builder
+FROM moby/buildkit:master AS builder
diff --git a/dockers/buildkit/syft/scanner/Dockerfile b/dockers/buildkit/syft/scanner/Dockerfile
@@ -17,4 +17,4 @@
 #
 
 # DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go
-FROM docker/buildkit-syft-scanner:edge AS scanner
+FROM docker/buildkit-syft-scanner:edge AS scanner
diff --git a/dockers/ci/base/Dockerfile b/dockers/ci/base/Dockerfile
@@ -128,4 +128,4 @@ RUN --mount=type=bind,target=.,rw \
     && rm -rf ${GOPATH}/src/github.com/${ORG}/${REPO}/*
 # skipcq: DOK-DL3002
 USER root:root
-ENTRYPOINT ["/bin/bash"]
+ENTRYPOINT ["/bin/bash"]
diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile
@@ -141,4 +141,4 @@ RUN --mount=type=bind,target=.,rw \
     && make faiss/install \
     && rm -rf ${GOPATH}/src/github.com/${ORG}/${REPO}/*
 # skipcq: DOK-DL3002
-USER root:root
+USER root:root
diff --git a/dockers/discoverer/k8s/Dockerfile b/dockers/discoverer/k8s/Dockerfile
@@ -86,4 +86,4 @@ COPY --from=builder /usr/bin/discoverer /usr/bin/discoverer
 COPY cmd/discoverer/k8s/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/discoverer"]
+ENTRYPOINT ["/usr/bin/discoverer"]
diff --git a/dockers/example/client/Dockerfile b/dockers/example/client/Dockerfile
@@ -93,4 +93,4 @@ LABEL maintainer="vdaas.org vald team <vald@vdaas.org>"
 COPY --from=builder /usr/bin/client /usr/bin/client
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/client"]
+ENTRYPOINT ["/usr/bin/client"]
diff --git a/dockers/gateway/filter/Dockerfile b/dockers/gateway/filter/Dockerfile
@@ -86,4 +86,4 @@ COPY --from=builder /usr/bin/filter /usr/bin/filter
 COPY cmd/gateway/filter/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/filter"]
+ENTRYPOINT ["/usr/bin/filter"]
diff --git a/dockers/gateway/lb/Dockerfile b/dockers/gateway/lb/Dockerfile
@@ -86,4 +86,4 @@ COPY --from=builder /usr/bin/lb /usr/bin/lb
 COPY cmd/gateway/lb/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/lb"]
+ENTRYPOINT ["/usr/bin/lb"]
diff --git a/dockers/gateway/mirror/Dockerfile b/dockers/gateway/mirror/Dockerfile
@@ -86,4 +86,4 @@ COPY --from=builder /usr/bin/mirror /usr/bin/mirror
 COPY cmd/gateway/mirror/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/mirror"]
+ENTRYPOINT ["/usr/bin/mirror"]
diff --git a/dockers/index/job/correction/Dockerfile b/dockers/index/job/correction/Dockerfile
@@ -86,4 +86,4 @@ COPY --from=builder /usr/bin/index-correction /usr/bin/index-correction
 COPY cmd/index/job/correction/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/index-correction"]
+ENTRYPOINT ["/usr/bin/index-correction"]
diff --git a/dockers/index/job/creation/Dockerfile b/dockers/index/job/creation/Dockerfile
@@ -86,4 +86,4 @@ COPY --from=builder /usr/bin/index-creation /usr/bin/index-creation
 COPY cmd/index/job/creation/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/index-creation"]
+ENTRYPOINT ["/usr/bin/index-creation"]
diff --git a/dockers/index/job/deletion/Dockerfile b/dockers/index/job/deletion/Dockerfile
@@ -86,4 +86,4 @@ COPY --from=builder /usr/bin/index-deletion /usr/bin/index-deletion
 COPY cmd/index/job/deletion/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/index-deletion"]
+ENTRYPOINT ["/usr/bin/index-deletion"]
diff --git a/dockers/index/job/readreplica/rotate/Dockerfile b/dockers/index/job/readreplica/rotate/Dockerfile
@@ -86,4 +86,4 @@ COPY --from=builder /usr/bin/readreplica-rotate /usr/bin/readreplica-rotate
 COPY cmd/index/job/readreplica/rotate/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/readreplica-rotate"]
+ENTRYPOINT ["/usr/bin/readreplica-rotate"]
diff --git a/dockers/index/job/save/Dockerfile b/dockers/index/job/save/Dockerfile
@@ -86,4 +86,4 @@ COPY --from=builder /usr/bin/index-save /usr/bin/index-save
 COPY cmd/index/job/save/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/index-save"]
+ENTRYPOINT ["/usr/bin/index-save"]
diff --git a/dockers/index/operator/Dockerfile b/dockers/index/operator/Dockerfile
@@ -86,4 +86,4 @@ COPY --from=builder /usr/bin/index-operator /usr/bin/index-operator
 COPY cmd/index/operator/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/index-operator"]
+ENTRYPOINT ["/usr/bin/index-operator"]
diff --git a/dockers/manager/index/Dockerfile b/dockers/manager/index/Dockerfile
@@ -86,4 +86,4 @@ COPY --from=builder /usr/bin/index /usr/bin/index
 COPY cmd/manager/index/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/index"]
+ENTRYPOINT ["/usr/bin/index"]
diff --git a/dockers/operator/helm/Dockerfile b/dockers/operator/helm/Dockerfile
@@ -107,4 +107,4 @@ COPY --from=builder /opt/helm/charts/vald /opt/helm/charts/vald
 COPY --from=builder /opt/helm/charts/vald-helm-operator /opt/helm/charts/vald-helm-operator
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/helm-operator", "run", "--watches-file=/opt/helm/watches.yaml"]
+ENTRYPOINT ["/usr/bin/helm-operator", "run", "--watches-file=/opt/helm/watches.yaml"]
diff --git a/dockers/tools/benchmark/job/Dockerfile b/dockers/tools/benchmark/job/Dockerfile
@@ -94,4 +94,4 @@ COPY --from=builder /usr/bin/job /usr/bin/job
 COPY cmd/tools/benchmark/job/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/job"]
+ENTRYPOINT ["/usr/bin/job"]
diff --git a/dockers/tools/benchmark/operator/Dockerfile b/dockers/tools/benchmark/operator/Dockerfile
@@ -86,4 +86,4 @@ COPY --from=builder /usr/bin/operator /usr/bin/operator
 COPY cmd/tools/benchmark/operator/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/operator"]
+ENTRYPOINT ["/usr/bin/operator"]
diff --git a/dockers/tools/cli/loadtest/Dockerfile b/dockers/tools/cli/loadtest/Dockerfile
@@ -94,4 +94,4 @@ COPY --from=builder /usr/bin/loadtest /usr/bin/loadtest
 COPY cmd/tools/cli/loadtest/sample.yaml /etc/server/config.yaml
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/loadtest"]
+ENTRYPOINT ["/usr/bin/loadtest"]
diff --git a/hack/docker/gen/main.go b/hack/docker/gen/main.go
@@ -1024,6 +1024,9 @@ jobs:
 			workflow.On.PullRequest.Paths = slices.Compact(workflow.On.PullRequest.Paths)
 
 			workflow.On.PullRequestTarget.Paths = workflow.On.PullRequest.Paths
+			if data.BuildPlatforms == "" {
+				data.BuildPlatforms = multiPlatforms
+			}
 			workflow.Jobs.Build.With.Platforms = data.BuildPlatforms
 
 			workflowYamlTmp, err := yaml.Marshal(workflow)

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,4 @@`
`17`	`17`	`#`
`18`	`18`
`19`	`19`	`# DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go`
`20`		`-FROM tonistiigi/binfmt:master AS builder`
	`20`	`+FROM tonistiigi/binfmt:master AS builder`