Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ppc64le support on multiarch docker images #3160

Merged
merged 4 commits into from
Jul 22, 2021
Merged

Add ppc64le support on multiarch docker images #3160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7df6da2
Add ppc64le support on multiarch docker images
krishvoor Jul 20, 2021
08de6b1
Merge branch 'master' into master
jpkrohling Jul 21, 2021
5468b51
Update the if-else condition
krishvoor Jul 22, 2021
51f4459
Merge branch 'master' into private-ppc64le
yurishkuro Jul 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/Makefile
View file
Open in desktop
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,linux/arm64
PLATFORMS := linux/amd64,linux/s390x,linux/ppc64le,linux/arm64

create-baseimg-debugimg: create-baseimg create-debugimg

Expand Down
7 changes: 4 additions & 3 deletions docker/debug/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ ARG TARGETARCH
ENV GOPATH /go
RUN apk add --update --no-cache ca-certificates make git
#Once go-delve adds support for s390x (see PR #2948), remove this entire conditional.
RUN if [[ "$TARGETARCH" != "s390x" ]] ; then \
#Once go-delve adds support for ppc64le (see PR go-delve/delve#1564), remove this entire conditional.
RUN if [[ "$TARGETARCH" == "s390x" || "$TARGETARCH" == "ppc64le" ]] ; then \
touch /go/bin/dlv; \
else \
go get github.com/go-delve/delve/cmd/dlv && \
cd /go/src/github.com/go-delve/delve && \
make install; \
else \
touch /go/bin/dlv; \
fi

FROM $golang_image
Expand Down
3 changes: 2 additions & 1 deletion scripts/build-all-in-one-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ make create-baseimg-debugimg

make build-all-in-one GOOS=linux GOARCH=amd64
make build-all-in-one GOOS=linux GOARCH=s390x
make build-all-in-one GOOS=linux GOARCH=ppc64le
make build-all-in-one GOOS=linux GOARCH=arm64
platforms="linux/amd64,linux/s390x,linux/arm64"
platforms="linux/amd64,linux/s390x,linux/ppc64le,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ make create-baseimg-debugimg
# build multi-arch binaries
make build-binaries-linux
make build-binaries-s390x
make build-binaries-ppc64le
make build-binaries-arm64

# build multi-arch docker images
platforms="linux/amd64,linux/s390x,linux/arm64"
platforms="linux/amd64,linux/s390x,linux/ppc64le,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ set -euxf -o pipefail

make build-examples GOOS=linux GOARCH=amd64
make build-examples GOOS=linux GOARCH=s390x
make build-examples GOOS=linux GOARCH=ppc64le
make build-examples GOOS=linux GOARCH=arm64

REPO=jaegertracing/example-hotrod
platforms="linux/amd64,linux/s390x,linux/arm64"
platforms="linux/amd64,linux/s390x,linux/ppc64le,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