diff --git a/docker/Makefile b/docker/Makefile index fab9116aedd..44ac62e66bf 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -5,7 +5,7 @@ GOLANG_IMAGE := golang:1.15-alpine BASE_IMAGE := localhost:5000/baseimg_alpine:latest DEBUG_IMAGE := localhost:5000/debugimg_alpine:latest -PLATFORMS := linux/amd64,linux/s390x +PLATFORMS := linux/amd64,linux/s390x,linux/arm64 create-baseimg-debugimg: create-baseimg create-debugimg diff --git a/scripts/build-all-in-one-image.sh b/scripts/build-all-in-one-image.sh index ba9a20b526e..6dd6985384d 100755 --- a/scripts/build-all-in-one-image.sh +++ b/scripts/build-all-in-one-image.sh @@ -38,7 +38,8 @@ make create-baseimg-debugimg make build-all-in-one GOOS=linux GOARCH=amd64 make build-all-in-one GOOS=linux GOARCH=s390x -platforms="linux/amd64,linux/s390x" +make build-all-in-one GOOS=linux GOARCH=arm64 +platforms="linux/amd64,linux/s390x,linux/arm64" repo=jaegertracing/all-in-one #build all-in-one image locally for integration test bash scripts/build-upload-a-docker-image.sh -l -b -c all-in-one -d cmd/all-in-one -p "${platforms}" -t release diff --git a/scripts/build-upload-docker-images.sh b/scripts/build-upload-docker-images.sh index c40757184f5..5b8716aad2f 100644 --- a/scripts/build-upload-docker-images.sh +++ b/scripts/build-upload-docker-images.sh @@ -7,9 +7,10 @@ make create-baseimg-debugimg # build multi-arch binaries make build-binaries-linux make build-binaries-s390x +make build-binaries-arm64 # build multi-arch docker images -platforms="linux/amd64,linux/s390x" +platforms="linux/amd64,linux/s390x,linux/arm64" # build/upload images for release version of Jaeger backend components for component in agent collector query ingester diff --git a/scripts/hotrod-integration-test.sh b/scripts/hotrod-integration-test.sh index 851919d6f89..3436e75e323 100755 --- a/scripts/hotrod-integration-test.sh +++ b/scripts/hotrod-integration-test.sh @@ -4,9 +4,10 @@ set -euxf -o pipefail make build-examples GOOS=linux GOARCH=amd64 make build-examples GOOS=linux GOARCH=s390x +make build-examples GOOS=linux GOARCH=arm64 REPO=jaegertracing/example-hotrod -platforms="linux/amd64,linux/s390x" +platforms="linux/amd64,linux/s390x,linux/arm64" #build image locally for integration test bash scripts/build-upload-a-docker-image.sh -l -c example-hotrod -d examples/hotrod -p "${platforms}"