Add s390x support on multiarch docker images (jaegertracing#2948)

athletic-geek · Jun 30, 2021 · 78d2f7d · 78d2f7d
1 parent 127293d
commit 78d2f7d
Show file tree

Hide file tree

Showing 27 changed files with 297 additions and 237 deletions.
diff --git a/.github/workflows/ci-all-in-one-build.yml b/.github/workflows/ci-all-in-one-build.yml
@@ -9,6 +9,11 @@ on:
 jobs:
   all-in-one:
     runs-on: ubuntu-latest
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
     steps:
     - uses: actions/[email protected]
       with:
@@ -31,6 +36,12 @@ jobs:
 
     - name: Install tools
       run: make install-ci
+
+    - uses: docker/setup-qemu-action@v1
+
+    - uses: docker/setup-buildx-action@v1
+      with:
+        driver-opts: network=host
 
     - name: Build, test, and publish all-in-one image
       run: bash scripts/build-all-in-one-image.sh

diff --git a/.github/workflows/ci-crossdock.yml b/.github/workflows/ci-crossdock.yml
@@ -9,6 +9,11 @@ on:
 jobs:
   crossdock:
     runs-on: ubuntu-latest
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
     strategy:
       matrix:
         steps:
@@ -33,6 +38,12 @@ jobs:
 
     - name: Install tools
       run: make install-ci
+
+    - uses: docker/setup-qemu-action@v1
+
+    - uses: docker/setup-buildx-action@v1
+      with:
+        driver-opts: network=host
 
     - name: Build, test, and publish ${{ matrix.steps.name }} image
       run: ${{ matrix.steps.cmd }}

diff --git a/.github/workflows/ci-docker-build.yml b/.github/workflows/ci-docker-build.yml
@@ -9,6 +9,13 @@ on:
 jobs:
   docker-images:
     runs-on: ubuntu-latest
+
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
+
     steps:
     - uses: actions/[email protected]
       with:
@@ -32,11 +39,14 @@ jobs:
     - name: Install tools
       run: make install-ci
 
-    - name: Build docker images
-      run: make docker
+    - uses: docker/setup-qemu-action@v1
 
-    - name: Upload docker images
-      run: bash scripts/upload-all-docker-images.sh
+    - uses: docker/setup-buildx-action@v1
+      with:
+        driver-opts: network=host
+
+    - name: Build and upload all docker images
+      run: bash scripts/build-upload-docker-images.sh
       env:
         DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
         QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
diff --git a/.github/workflows/ci-hotrod.yml b/.github/workflows/ci-hotrod.yml
@@ -9,6 +9,11 @@ on:
 jobs:
   hotrod:
     runs-on: ubuntu-latest
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
     steps:
     - uses: actions/[email protected]
       with:
@@ -27,6 +32,12 @@ jobs:
 
     - name: Install tools
       run: make install-ci
+
+    - uses: docker/setup-qemu-action@v1
+
+    - uses: docker/setup-buildx-action@v1
+      with:
+        driver-opts: network=host
 
     - name: Build, test, and publish hotrod image
       run: bash scripts/hotrod-integration-test.sh

diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
@@ -8,6 +8,12 @@ on:
 jobs:
   publish-release:
     runs-on: ubuntu-latest
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
+
     steps:
     - uses: actions/[email protected]
       with:
@@ -49,13 +55,14 @@ jobs:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
       if: steps.package-binaries.outcome == 'success'
 
-    - name: Build docker images
-      id: build-images
-      run: make docker
+    - uses: docker/setup-qemu-action@v1
 
-    - name: Upload docker images
-      run: bash scripts/upload-all-docker-images.sh
-      if: steps.build-images.outcome == 'success'
+    - uses: docker/setup-buildx-action@v1
+      with:
+        driver-opts: network=host
+
+    - name: Build and upload all docker images
+      run: bash scripts/build-upload-docker-images.sh
       env:
         DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
         QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}

diff --git a/Makefile b/Makefile
@@ -269,9 +269,6 @@ build-collector build-collector-debug:
 build-ingester build-ingester-debug:
 	$(GOBUILD) $(DISABLE_OPTIMIZATIONS) -o ./cmd/ingester/ingester$(SUFFIX)-$(GOOS)-$(GOARCH) $(BUILD_INFO) ./cmd/ingester/main.go
 
-.PHONY: docker
-docker: build-binaries-linux docker-images-only
-
 .PHONY: build-binaries-linux
 build-binaries-linux:
 	GOOS=linux GOARCH=amd64 $(MAKE) build-platform-binaries
@@ -308,7 +305,8 @@ build-platform-binaries: build-agent \
 	build-all-in-one \
 	build-examples \
 	build-tracegen \
-	build-anonymizer
+	build-anonymizer \
+	build-esmapping-generator
 
 .PHONY: build-all-platforms
 build-all-platforms: build-binaries-linux build-binaries-windows build-binaries-darwin build-binaries-s390x build-binaries-arm64 build-binaries-ppc64le
@@ -319,9 +317,10 @@ docker-images-cassandra:
 	@echo "Finished building jaeger-cassandra-schema =============="
 
 .PHONY: docker-images-elastic
-docker-images-elastic: build-esmapping-generator-linux
+docker-images-elastic: 
+	GOOS=linux GOARCH=$(GOARCH) $(MAKE) build-esmapping-generator
 	docker build -t $(DOCKER_NAMESPACE)/jaeger-es-index-cleaner:${DOCKER_TAG} plugin/storage/es
-	docker build -t $(DOCKER_NAMESPACE)/jaeger-es-rollover:${DOCKER_TAG} plugin/storage/es -f plugin/storage/es/Dockerfile.rollover
+	docker build -t $(DOCKER_NAMESPACE)/jaeger-es-rollover:${DOCKER_TAG} plugin/storage/es -f plugin/storage/es/Dockerfile.rollover --build-arg TARGETARCH=$(GOARCH)
 	@echo "Finished building jaeger-es-indices-clean =============="
 
 docker-images-jaeger-backend: TARGET = release
@@ -358,21 +357,13 @@ docker-images-only: docker-images-cassandra \
 	docker-images-tracegen \
 	docker-images-anonymizer
 
-.PHONY: docker-push
-docker-push:
-	@while [ -z "$$CONFIRM" ]; do \
-		read -r -p "Do you really want to push images to repository \"${DOCKER_NAMESPACE}\"? [y/N] " CONFIRM; \
-	done ; \
-	if [ $$CONFIRM != "y" ] && [ $$CONFIRM != "Y" ]; then \
-		echo "Exiting." ; exit 1 ; \
-	fi
-	for component in agent cassandra-schema es-index-cleaner es-rollover collector query ingester example-hotrod tracegen anonymizer; do \
-		docker push $(DOCKER_NAMESPACE)/jaeger-$$component ; \
-	done
+.PHONY: build-crossdock-binary
+build-crossdock-binary:
+	$(GOBUILD) -o ./crossdock/crossdock-$(GOOS)-$(GOARCH) ./crossdock/main.go
 
 .PHONY: build-crossdock-linux
 build-crossdock-linux:
-	GOOS=linux $(GOBUILD) -o ./crossdock/crossdock-linux ./crossdock/main.go
+	GOOS=linux $(MAKE) build-crossdock-binary
 
 include crossdock/rules.mk
 
@@ -385,7 +376,7 @@ build-crossdock-ui-placeholder:
 
 .PHONY: build-crossdock
 build-crossdock: build-crossdock-ui-placeholder build-binaries-linux build-crossdock-linux docker-images-cassandra docker-images-jaeger-backend
-	docker build -t $(DOCKER_NAMESPACE)/test-driver:${DOCKER_TAG} crossdock/
+	docker build -t $(DOCKER_NAMESPACE)/test-driver:${DOCKER_TAG} --build-arg TARGETARCH=$(GOARCH) crossdock/
 	@echo "Finished building test-driver ==============" ; \
 
 .PHONY: build-and-run-crossdock

diff --git a/cmd/agent/Dockerfile b/cmd/agent/Dockerfile
@@ -2,7 +2,7 @@ ARG base_image
 ARG debug_image
 
 FROM $base_image AS release
-ARG TARGETARCH=amd64
+ARG TARGETARCH
 ARG USER_UID=10001
 COPY agent-linux-$TARGETARCH /go/bin/agent-linux
 EXPOSE 5775/udp 6831/udp 6832/udp 5778/tcp

diff --git a/cmd/all-in-one/Dockerfile b/cmd/all-in-one/Dockerfile
@@ -2,7 +2,7 @@ ARG base_image
 ARG debug_image
 
 FROM $base_image AS release
-ARG TARGETARCH=amd64
+ARG TARGETARCH
 
 # Agent zipkin.thrift compact
 EXPOSE 5775/udp

diff --git a/cmd/anonymizer/Dockerfile b/cmd/anonymizer/Dockerfile
@@ -1,5 +1,5 @@
 FROM scratch
-ARG TARGETARCH=amd64
+ARG TARGETARCH
 
 COPY anonymizer-linux-$TARGETARCH /go/bin/anonymizer-linux
 ENTRYPOINT ["/go/bin/anonymizer-linux"]
diff --git a/cmd/collector/Dockerfile b/cmd/collector/Dockerfile
@@ -2,7 +2,7 @@ ARG base_image
 ARG debug_image
 
 FROM $base_image AS release
-ARG TARGETARCH=amd64
+ARG TARGETARCH
 COPY collector-linux-$TARGETARCH /go/bin/collector-linux
 EXPOSE 14250/tcp
 ENTRYPOINT ["/go/bin/collector-linux"]

diff --git a/cmd/ingester/Dockerfile b/cmd/ingester/Dockerfile
@@ -2,7 +2,7 @@ ARG base_image
 ARG debug_image
 
 FROM $base_image AS release
-ARG TARGETARCH=amd64
+ARG TARGETARCH
 COPY ingester-linux-$TARGETARCH /go/bin/ingester-linux
 EXPOSE 14270/tcp 14271/tcp
 ENTRYPOINT ["/go/bin/ingester-linux"]

diff --git a/cmd/query/Dockerfile b/cmd/query/Dockerfile
@@ -2,7 +2,7 @@ ARG base_image
 ARG debug_image
 
 FROM $base_image AS release
-ARG TARGETARCH=amd64
+ARG TARGETARCH
 COPY query-linux-$TARGETARCH /go/bin/query-linux
 EXPOSE 16686/tcp
 ENTRYPOINT ["/go/bin/query-linux"]

diff --git a/cmd/tracegen/Dockerfile b/cmd/tracegen/Dockerfile
@@ -1,5 +1,5 @@
 FROM scratch
-ARG TARGETARCH=amd64
+ARG TARGETARCH
 
 COPY tracegen-linux-$TARGETARCH /go/bin/tracegen-linux
 ENTRYPOINT ["/go/bin/tracegen-linux"]
diff --git a/crossdock/Dockerfile b/crossdock/Dockerfile
@@ -1,6 +1,7 @@
 FROM scratch
+ARG TARGETARCH
 
-COPY crossdock-linux /go/bin/
+COPY crossdock-linux-$TARGETARCH /go/bin/crossdock-linux
 
 EXPOSE 8080
 ENTRYPOINT ["/go/bin/crossdock-linux"]
diff --git a/docker/Makefile b/docker/Makefile
@@ -1,20 +1,23 @@
 VERSION := 1.0.0
 ROOT_IMAGE ?= alpine:3.13
-CERT_IMAGE := alpine:3.13
+CERT_IMAGE := $(ROOT_IMAGE)
 GOLANG_IMAGE := golang:1.15-alpine
 
-BASE_IMAGE := localhost/baseimg:$(VERSION)-$(shell echo $(ROOT_IMAGE) | tr : -)
-DEBUG_IMAGE := localhost/debugimg:$(VERSION)-$(shell echo $(GOLANG_IMAGE) | tr : -)
+BASE_IMAGE := localhost:5000/baseimg_alpine:latest
+DEBUG_IMAGE := localhost:5000/debugimg_alpine:latest
+PLATFORMS := linux/amd64,linux/s390x
 
 create-baseimg-debugimg: create-baseimg create-debugimg
 
 create-baseimg:
-	docker build -t $(BASE_IMAGE) \
+	docker buildx build -t $(BASE_IMAGE) --push \
 		--build-arg root_image=$(ROOT_IMAGE) \
 		--build-arg cert_image=$(CERT_IMAGE) \
+		--platform=$(PLATFORMS) \
 		docker/base
 
 create-debugimg:
-	docker build -t $(DEBUG_IMAGE) \
+	docker buildx build -t $(DEBUG_IMAGE) --push \
 		--build-arg golang_image=$(GOLANG_IMAGE) \
+		--platform=$(PLATFORMS) \
 		docker/debug
diff --git a/docker/debug/Dockerfile b/docker/debug/Dockerfile
@@ -1,11 +1,17 @@
 ARG golang_image
 
 FROM $golang_image AS build
+ARG TARGETARCH
 ENV GOPATH /go
-RUN apk add --update --no-cache ca-certificates make git && \
-    go get github.com/go-delve/delve/cmd/dlv && \
-    cd /go/src/github.com/go-delve/delve && \
-    make install
+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 \
+        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
 COPY --from=build /go/bin/dlv /go/bin/dlv

diff --git a/examples/hotrod/Dockerfile b/examples/hotrod/Dockerfile
@@ -1,5 +1,5 @@
 FROM scratch
-ARG TARGETARCH=amd64
+ARG TARGETARCH
 EXPOSE 8080 8081 8082 8083
 COPY hotrod-linux-$TARGETARCH /go/bin/hotrod-linux
 ENTRYPOINT ["/go/bin/hotrod-linux"]

diff --git a/plugin/storage/es/Dockerfile.rollover b/plugin/storage/es/Dockerfile.rollover
@@ -1,11 +1,12 @@
 FROM python:3-alpine3.11
+ARG TARGETARCH
 
 # Temporary fix for https://github.com/jaegertracing/jaeger/issues/1494
 RUN pip install urllib3==1.24.3
 
 RUN pip install elasticsearch elasticsearch-curator
 COPY ./mappings/* /mappings/
 COPY esRollover.py /es-rollover/
-COPY esmapping-generator /usr/bin/
+COPY esmapping-generator-linux-$TARGETARCH /usr/bin/esmapping-generator
 
 ENTRYPOINT ["python3", "/es-rollover/esRollover.py"]