Add s390x support on multiarch docker images

.github/workflows/ci-all-in-one-build.yml

@@ -6,9 +6,14 @@ on:
   pull_request:
     branches: [ master ]
 
-jobs:
+jobs:   
   all-in-one:
     runs-on: ubuntu-latest
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
     steps:
     - uses: actions/checkout@v2
       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

.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/checkout@v2
       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 }}

.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/checkout@v2
       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 }}

Makefile

@@ -72,6 +72,17 @@ MOCKERY=mockery
 
 .DEFAULT_GOAL := test-and-lint
 
+BASE_IMAGE_MULTIARCH := localhost:5000/baseimg:$(VERSION)-$(shell echo $(ROOT_IMAGE) | tr : -)
+PLATFORMS=linux/amd64,linux/s390x
+INGESTER_TAG=$(subst JAGERCOMP,ingester,$(IMAGE_TAGS))
+AGENT_TAG=$(subst JAGERCOMP,agent,$(IMAGE_TAGS))
+COLLECTOR_TAG=$(subst JAGERCOMP,collector,$(IMAGE_TAGS))
+QUERY_TAG=$(subst JAGERCOMP,query,$(IMAGE_TAGS))
+ESINDEX_TAG=$(subst JAGERCOMP,es-index-cleaner,$(IMAGE_TAGS))
+ESROLLOVER_TAG=$(subst JAGERCOMP,es-rollover,$(IMAGE_TAGS))
+TRACEGEN_TAG=$(subst JAGERCOMP,tracegen,$(IMAGE_TAGS))
+ANONYMIZER_TAG=$(subst JAGERCOMP,anonymizer,$(IMAGE_TAGS))
+
 .PHONY: test-and-lint
 test-and-lint: test fmt lint
 
@@ -298,7 +309,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
@@ -309,9 +321,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
@@ -348,6 +361,73 @@ docker-images-only: docker-images-cassandra \
 	docker-images-tracegen \
 	docker-images-anonymizer
 
+.PHONY: multiarch-docker
+multiarch-docker: build-binaries-linux \
+	build-binaries-s390x \
+	multiarch-docker-images-only
+
+.PHONY: multiarch-docker-images-only
+multiarch-docker-images-only: docker-images-jaeger-backend-multiarch \
+	docker-images-elastic-multiarch \
+	docker-images-tracegen-multiarch \
+	docker-images-anonymizer-multiarch
+
+.PHONY: create-baseimage-multiarch
+create-baseimage-multiarch:
+	docker buildx build -t $(BASE_IMAGE_MULTIARCH) --push \
+		--build-arg root_image=$(ROOT_IMAGE) \
+		--build-arg cert_image=$(CERT_IMAGE) \
+		--platform=$(PLATFORMS) \
+		docker/base
+	echo "Finished building multiarch base image =============="
+
+.PHONY: docker-images-jaeger-backend-multiarch
+docker-images-jaeger-backend-multiarch: create-baseimage-multiarch
+	for component in agent collector query ingester ; do \
+		docker buildx build --output "$(PUSHTAG)" \
+    		--progress=plain --target release \
+    		--build-arg base_image=$(BASE_IMAGE_MULTIARCH) \
+			--build-arg debug_image=$(GOLANG_IMAGE) \
+    		--platform=$(PLATFORMS) \
+    		--file cmd/$$component/Dockerfile \
+    		$(subst JAGERCOMP,$$component,$(IMAGE_TAGS)) \
+			cmd/$$component; \
+		echo "Finished building $$component ==============" ; \
+	done
+
+.PHONY: docker-images-elastic-multiarch
+docker-images-elastic-multiarch:
+	docker buildx build --output "$(PUSHTAG)" \
+		--progress=plain \
+		--platform=$(PLATFORMS) \
+		${ESINDEX_TAG} \
+		plugin/storage/es
+	docker buildx build --output "$(PUSHTAG)" \
+		--progress=plain \
+		--platform=$(PLATFORMS) \
+		--file plugin/storage/es/Dockerfile.rollover \
+		${ESROLLOVER_TAG} \
+		plugin/storage/es
+	@echo "Finished building multiarch jaeger-es-indices-clean =============="
+
+.PHONY: docker-images-tracegen-multiarch
+docker-images-tracegen-multiarch:
+	docker buildx build --output "$(PUSHTAG)" \
+    	--progress=plain \
+    	--platform=$(PLATFORMS) \
+    	${TRACEGEN_TAG} \
+		cmd/tracegen/
+	@echo "Finished building multiarch jaeger-tracegen =============="
+
+.PHONY: docker-images-anonymizer-multiarch
+docker-images-anonymizer-multiarch:
+	docker buildx build --output "$(PUSHTAG)" \
+    	--progress=plain \
+    	--platform=$(PLATFORMS) \
+    	$(ANONYMIZER_TAG) \
+		cmd/anonymizer/
+	@echo "Finished building multiarch jaeger-anonymizer =============="
+
 .PHONY: docker-push
 docker-push:
 	@while [ -z "$$CONFIRM" ]; do \

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

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
@@ -28,6 +28,8 @@ EXPOSE 16686
 COPY all-in-one-linux-$TARGETARCH /go/bin/all-in-one-linux
 COPY sampling_strategies.json /etc/jaeger/
 
+RUN chmod +x /go/bin/all-in-one-linux
+
 VOLUME ["/tmp"]
 ENTRYPOINT ["/go/bin/all-in-one-linux"]
 CMD ["--sampling.strategies-file=/etc/jaeger/sampling_strategies.json"]

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"]

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"]

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"]

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"]

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"]

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"]
+ENTRYPOINT ["python3", "/es-rollover/esRollover.py"]