Skip to content

Commit

Permalink
build images for linux/arm64 (#3124)
Browse files Browse the repository at this point in the history
Signed-off-by: Tommaso Garuglieri <garuglieritommaso.dev@gmail.com>

Signed-off-by: GaruGaru <garuglieritommaso.dev@gmail.com>

Co-authored-by: Juraci Paixão Kröhling <juraci@kroehling.de>
  • Loading branch information
GaruGaru and jpkrohling committed Jul 5, 2021
1 parent 23b5b66 commit 7a83219
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion scripts/build-all-in-one-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion scripts/build-upload-docker-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion scripts/hotrod-integration-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down

0 comments on commit 7a83219

Please sign in to comment.