From d39215cbaa54290537d9a2bdcfa48cb479c53b30 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Mon, 6 Feb 2017 14:43:13 -0500 Subject: [PATCH] added ppc64le and s390x fixes for manpages Fixes manpages for p and z by downloading a specific version of go instead of relying on the distro version. Signed-off-by: Christopher Jones --- man/Dockerfile.ppc64le | 14 ++++++++++++-- man/Dockerfile.s390x | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/man/Dockerfile.ppc64le b/man/Dockerfile.ppc64le index f554650274..fc96ca7691 100644 --- a/man/Dockerfile.ppc64le +++ b/man/Dockerfile.ppc64le @@ -1,9 +1,19 @@ FROM ppc64le/ubuntu:xenial -RUN apt-get update && apt-get install -y git golang-go +RUN apt-get update && apt-get install -y \ + curl \ + gcc \ + git \ + make \ + tar + +ENV GO_VERSION 1.7.5 +RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" \ + | tar -xzC /usr/local +ENV PATH /usr/local/go/bin:$PATH +ENV GOPATH=/go RUN mkdir -p /go/src /go/bin /go/pkg -ENV GOPATH=/go:/usr/lib/go-1.6 RUN export GLIDE=v0.11.1; \ export TARGET=/go/src/github.com/Masterminds; \ mkdir -p ${TARGET} && \ diff --git a/man/Dockerfile.s390x b/man/Dockerfile.s390x index 6292e00cb7..d4bcf1da11 100644 --- a/man/Dockerfile.s390x +++ b/man/Dockerfile.s390x @@ -1,9 +1,19 @@ FROM s390x/ubuntu:xenial -RUN apt-get update && apt-get install -y git golang-go +RUN apt-get update && apt-get install -y \ + curl \ + gcc \ + git \ + make \ + tar + +ENV GO_VERSION 1.7.5 +RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" \ + | tar -xzC /usr/local +ENV PATH /usr/local/go/bin:$PATH +ENV GOPATH=/go RUN mkdir -p /go/src /go/bin /go/pkg -ENV GOPATH=/go:/usr/lib/go-1.6 RUN export GLIDE=v0.11.1; \ export TARGET=/go/src/github.com/Masterminds; \ mkdir -p ${TARGET} && \