Adds s390x support

weaveworks · Apr 12, 2021 · dddd5e1 · dddd5e1
1 parent 053afd5
commit dddd5e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -14,7 +14,7 @@ RUN set -eux; \
 RUN go clean -i net && \
 	go install -tags netgo std && \
    export arch_val="$(dpkg --print-architecture)"; \
-   if [ "$arch_val" != "ppc64el" ]; then \
+   if [ "$arch_val" != "ppc64el" ] && [ "$arch_val" != "s390x" ]; then \
 	go install -race -tags netgo std; \
    fi; \
     go get -tags netgo \
@@ -43,6 +43,8 @@ RUN export arch_val="$(dpkg --print-architecture)"; \
         curl -fsSLO https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKERVERSION}.tgz; \
     elif [ "$arch_val" = "ppc64el" ]; then \
         curl -fsSLO https://download.docker.com/linux/static/stable/ppc64le/docker-${DOCKERVERSION}.tgz; \
+    elif [ "$arch_val" = "s390x" ]; then \
+        curl -fsSLO https://download.docker.com/linux/static/stable/s390x/docker-${DOCKERVERSION}.tgz; \
     else \
         echo "No Docker client found for architecture $(arch_val)." && \
         exit 1; \

diff --git a/probe/endpoint/dns_snooper_others.go b/probe/endpoint/dns_snooper_others.go
@@ -1,4 +1,4 @@
-// +build darwin arm arm64
+// +build darwin arm arm64 s390x
 
 // Cross-compiling the snooper requires having pcap binaries,
 // let's disable it for now.