github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 09:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3845 from linux-on-ibm-z/s390x-support

Browse Source 
Add s390x support
This commit is contained in:
Bryan Boreham
2021-04-27 12:37:20 +01:00
committed by GitHub
parent c28847d67c dddd5e1b8e
commit ad63f05ed0
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/Dockerfile
View File

@@ -14,7 +14,7 @@ RUN set -eux; \
RUN go clean -i net && \ RUN go clean -i net && \
go install -tags netgo std && \ go install -tags netgo std && \
export arch_val="$(dpkg --print-architecture)"; \ 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; \ go install -race -tags netgo std; \
fi; \ fi; \
go get -tags netgo \ 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; \ curl -fsSLO https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKERVERSION}.tgz; \
elif [ "$arch_val" = "ppc64el" ]; then \ elif [ "$arch_val" = "ppc64el" ]; then \
curl -fsSLO https://download.docker.com/linux/static/stable/ppc64le/docker-${DOCKERVERSION}.tgz; \ 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 \ else \
echo "No Docker client found for architecture $(arch_val)." && \ echo "No Docker client found for architecture $(arch_val)." && \
exit 1; \ exit 1; \

2
probe/endpoint/dns_snooper_others.go
View File

@@ -1,4 +1,4 @@
// +build darwin arm arm64 // +build darwin arm arm64 s390x
// Cross-compiling the snooper requires having pcap binaries, // Cross-compiling the snooper requires having pcap binaries,
// let's disable it for now. // let's disable it for now.