fix: ARG ARCH to TARGETARCH for multi platform by docker buildx

Signed-off-by: Morlay <morlay.null@gmail.com>
jaegertracing · Jul 1, 2020 · 1ed2940 · 1ed2940
1 parent 64a27f1
commit 1ed2940
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 37 deletions.
diff --git a/Makefile b/Makefile
@@ -205,7 +205,7 @@ build-tracegen:
 .PHONY: docker-hotrod
 docker-hotrod:
 	GOOS=linux $(MAKE) build-examples
-	docker build -t $(DOCKER_NAMESPACE)/example-hotrod:${DOCKER_TAG} ./examples/hotrod --build-arg ARCH=$(GOARCH)
+	docker build -t $(DOCKER_NAMESPACE)/example-hotrod:${DOCKER_TAG} ./examples/hotrod --build-arg TARGETARCH=$(GOARCH)
 
 .PHONY: run-all-in-one
 run-all-in-one:
@@ -305,16 +305,16 @@ docker-images-elastic:
 .PHONY: docker-images-jaeger-backend
 docker-images-jaeger-backend:
 	for component in agent collector query ingester ; do \
-		docker build -t $(DOCKER_NAMESPACE)/jaeger-$$component:${DOCKER_TAG} cmd/$$component --build-arg ARCH=$(GOARCH) ; \
+		docker build -t $(DOCKER_NAMESPACE)/jaeger-$$component:${DOCKER_TAG} cmd/$$component --build-arg TARGETARCH=$(GOARCH) ; \
 		echo "Finished building $$component ==============" ; \
 	done
-	docker build -t $(DOCKER_NAMESPACE)/jaeger-opentelemetry-collector:${DOCKER_TAG} -f ${OTEL_COLLECTOR_DIR}/cmd/collector/Dockerfile cmd/opentelemetry/cmd/collector --build-arg ARCH=$(GOARCH)
-	docker build -t $(DOCKER_NAMESPACE)/jaeger-opentelemetry-agent:${DOCKER_TAG} -f ${OTEL_COLLECTOR_DIR}/cmd/agent/Dockerfile cmd/opentelemetry/cmd/agent --build-arg ARCH=$(GOARCH)
-	docker build -t $(DOCKER_NAMESPACE)/jaeger-opentelemetry-ingester:${DOCKER_TAG} -f ${OTEL_COLLECTOR_DIR}/cmd/ingester/Dockerfile cmd/opentelemetry/cmd/ingester --build-arg ARCH=$(GOARCH)
+	docker build -t $(DOCKER_NAMESPACE)/jaeger-opentelemetry-collector:${DOCKER_TAG} -f ${OTEL_COLLECTOR_DIR}/cmd/collector/Dockerfile cmd/opentelemetry/cmd/collector --build-arg TARGETARCH=$(GOARCH)
+	docker build -t $(DOCKER_NAMESPACE)/jaeger-opentelemetry-agent:${DOCKER_TAG} -f ${OTEL_COLLECTOR_DIR}/cmd/agent/Dockerfile cmd/opentelemetry/cmd/agent --build-arg TARGETARCH=$(GOARCH)
+	docker build -t $(DOCKER_NAMESPACE)/jaeger-opentelemetry-ingester:${DOCKER_TAG} -f ${OTEL_COLLECTOR_DIR}/cmd/ingester/Dockerfile cmd/opentelemetry/cmd/ingester --build-arg TARGETARCH=$(GOARCH)
 
 .PHONY: docker-images-tracegen
 docker-images-tracegen:
-	docker build -t $(DOCKER_NAMESPACE)/jaeger-tracegen:${DOCKER_TAG} cmd/tracegen/ --build-arg ARCH=$(GOARCH)
+	docker build -t $(DOCKER_NAMESPACE)/jaeger-tracegen:${DOCKER_TAG} cmd/tracegen/ --build-arg TARGETARCH=$(GOARCH)
 	@echo "Finished building jaeger-tracegen =============="
 
 .PHONY: docker-images-only

diff --git a/cmd/agent/Dockerfile b/cmd/agent/Dockerfile
@@ -2,9 +2,9 @@ FROM alpine:latest as certs
 RUN apk add --update --no-cache ca-certificates
 
 FROM scratch
-ARG ARCH=amd64
+ARG TARGETARCH=amd64
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 
 EXPOSE 5775/udp 6831/udp 6832/udp 5778
-COPY agent-linux-$ARCH /go/bin/agent-linux
+COPY agent-linux-$TARGETARCH /go/bin/agent-linux
 ENTRYPOINT ["/go/bin/agent-linux"]
diff --git a/cmd/all-in-one/Dockerfile b/cmd/all-in-one/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:latest as certs
 RUN apk add --update --no-cache ca-certificates
 
 FROM scratch
-ARG ARCH=amd64
+ARG TARGETARCH=amd64
 
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 
@@ -27,7 +27,7 @@ EXPOSE 14250
 # Web HTTP
 EXPOSE 16686
 
-COPY all-in-one-linux-$ARCH /go/bin/all-in-one-linux
+COPY all-in-one-linux-$TARGETARCH /go/bin/all-in-one-linux
 COPY sampling_strategies.json /etc/jaeger/
 
 VOLUME ["/tmp"]

diff --git a/cmd/collector/Dockerfile b/cmd/collector/Dockerfile
@@ -2,9 +2,9 @@ FROM alpine:latest as certs
 RUN apk add --update --no-cache ca-certificates
 
 FROM scratch
-ARG ARCH=amd64
+ARG TARGETARCH=amd64
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 
 EXPOSE 14250
-COPY collector-linux-$ARCH /go/bin/collector-linux
+COPY collector-linux-$TARGETARCH /go/bin/collector-linux
 ENTRYPOINT ["/go/bin/collector-linux"]
diff --git a/cmd/ingester/Dockerfile b/cmd/ingester/Dockerfile
@@ -2,10 +2,10 @@ FROM alpine:latest as certs
 RUN apk add --update --no-cache ca-certificates
 
 FROM scratch
-ARG ARCH=amd64
+ARG TARGETARCH=amd64
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 
 EXPOSE 14270
 EXPOSE 14271
-COPY ingester-linux-$ARCH /go/bin/ingester-linux
+COPY ingester-linux-$TARGETARCH /go/bin/ingester-linux
 ENTRYPOINT ["/go/bin/ingester-linux"]
diff --git a/cmd/opentelemetry/cmd/agent/Dockerfile b/cmd/opentelemetry/cmd/agent/Dockerfile
@@ -2,9 +2,9 @@ FROM alpine:latest as certs
 RUN apk add --update --no-cache ca-certificates
 
 FROM scratch
-ARG ARCH=amd64
+ARG TARGETARCH=amd64
 
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 
-COPY opentelemetry-agent-linux-$ARCH /go/bin/opentelemetry-agent-linux
+COPY opentelemetry-agent-linux-$TARGETARCH /go/bin/opentelemetry-agent-linux
 ENTRYPOINT ["/go/bin/opentelemetry-agent-linux"]
diff --git a/cmd/opentelemetry/cmd/all-in-one/Dockerfile b/cmd/opentelemetry/cmd/all-in-one/Dockerfile
@@ -2,9 +2,9 @@ FROM alpine:latest as certs
 RUN apk add --update --no-cache ca-certificates
 
 FROM scratch
-ARG ARCH=amd64
+ARG TARGETARCH=amd64
 
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 
-COPY opentelemetry-all-in-one-linux-$ARCH /go/bin/opentelemetry-all-in-one-linux
+COPY opentelemetry-all-in-one-linux-$TARGETARCH /go/bin/opentelemetry-all-in-one-linux
 ENTRYPOINT ["/go/bin/opentelemetry-all-in-one-linux"]
diff --git a/cmd/opentelemetry/cmd/collector/Dockerfile b/cmd/opentelemetry/cmd/collector/Dockerfile
@@ -2,8 +2,8 @@ FROM alpine:latest as certs
 RUN apk add --update --no-cache ca-certificates
 
 FROM scratch
-ARG ARCH=amd64
+ARG TARGETARCH=amd64
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 
-COPY opentelemetry-collector-linux-$ARCH /go/bin/opentelemetry-collector-linux
+COPY opentelemetry-collector-linux-$TARGETARCH /go/bin/opentelemetry-collector-linux
 ENTRYPOINT ["/go/bin/opentelemetry-collector-linux"]
diff --git a/cmd/opentelemetry/cmd/ingester/Dockerfile b/cmd/opentelemetry/cmd/ingester/Dockerfile
@@ -2,9 +2,9 @@ FROM alpine:latest as certs
 RUN apk add --update --no-cache ca-certificates
 
 FROM scratch
-ARG ARCH=amd64
+ARG TARGETARCH=amd64
 
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 
-COPY opentelemetry-ingester-linux-$ARCH /go/bin/opentelemetry-ingester-linux
+COPY opentelemetry-ingester-linux-$TARGETARCH /go/bin/opentelemetry-ingester-linux
 ENTRYPOINT ["/go/bin/opentelemetry-ingester-linux"]
diff --git a/cmd/query/Dockerfile b/cmd/query/Dockerfile
@@ -2,11 +2,11 @@ FROM alpine:latest as certs
 RUN apk add --update --no-cache ca-certificates
 
 FROM scratch
-ARG ARCH=amd64
+ARG TARGETARCH=amd64
 
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 
 EXPOSE 16686
-COPY query-linux-$ARCH /go/bin/query-linux
+COPY query-linux-$TARGETARCH /go/bin/query-linux
 
 ENTRYPOINT ["/go/bin/query-linux"]
diff --git a/cmd/tracegen/Dockerfile b/cmd/tracegen/Dockerfile
@@ -1,5 +1,5 @@
 FROM scratch
-ARG ARCH=amd64
+ARG TARGETARCH=amd64
 
-COPY tracegen-linux-$ARCH /go/bin/tracegen-linux
+COPY tracegen-linux-$TARGETARCH /go/bin/tracegen-linux
 ENTRYPOINT ["/go/bin/tracegen-linux"]
diff --git a/examples/hotrod/Dockerfile b/examples/hotrod/Dockerfile
@@ -1,6 +1,6 @@
 FROM scratch
-ARG ARCH=amd64
+ARG TARGETARCH=amd64
 EXPOSE 8080 8081 8082 8083
-COPY hotrod-linux-$ARCH /go/bin/hotrod-linux
+COPY hotrod-linux-$TARGETARCH /go/bin/hotrod-linux
 ENTRYPOINT ["/go/bin/hotrod-linux"]
 CMD ["all"]
diff --git a/plugin/storage/es/mappings/gen_assets.go b/plugin/storage/es/mappings/gen_assets.go
diff --git a/scripts/travis/build-all-in-one-image.sh b/scripts/travis/build-all-in-one-image.sh
@@ -40,12 +40,12 @@ upload_to_docker() {
 
 make build-all-in-one GOOS=linux GOARCH=$GOARCH
 repo=jaegertracing/all-in-one
-docker build -f cmd/all-in-one/Dockerfile -t $repo:latest cmd/all-in-one --build-arg ARCH=$GOARCH
+docker build -f cmd/all-in-one/Dockerfile -t $repo:latest cmd/all-in-one --build-arg TARGETARCH=$GOARCH
 run_integration_test $repo
 upload_to_docker $repo
 
 make build-otel-all-in-one GOOS=linux GOARCH=$GOARCH
 repo=jaegertracing/opentelemetry-all-in-one
-docker build -f cmd/opentelemetry/cmd/all-in-one/Dockerfile -t $repo:latest cmd/opentelemetry/cmd/all-in-one --build-arg ARCH=$GOARCH
+docker build -f cmd/opentelemetry/cmd/all-in-one/Dockerfile -t $repo:latest cmd/opentelemetry/cmd/all-in-one --build-arg TARGETARCH=$GOARCH
 run_integration_test $repo
 upload_to_docker $repo