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 <tophj@linux.vnet.ibm.com>
This commit is contained in:
Christopher Jones 2017-02-06 14:43:13 -05:00 committed by Tibor Vass
parent e6889bf41b
commit d39215cbaa
2 changed files with 24 additions and 4 deletions

View File

@ -1,9 +1,19 @@
FROM ppc64le/ubuntu:xenial 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 RUN mkdir -p /go/src /go/bin /go/pkg
ENV GOPATH=/go:/usr/lib/go-1.6
RUN export GLIDE=v0.11.1; \ RUN export GLIDE=v0.11.1; \
export TARGET=/go/src/github.com/Masterminds; \ export TARGET=/go/src/github.com/Masterminds; \
mkdir -p ${TARGET} && \ mkdir -p ${TARGET} && \

View File

@ -1,9 +1,19 @@
FROM s390x/ubuntu:xenial 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 RUN mkdir -p /go/src /go/bin /go/pkg
ENV GOPATH=/go:/usr/lib/go-1.6
RUN export GLIDE=v0.11.1; \ RUN export GLIDE=v0.11.1; \
export TARGET=/go/src/github.com/Masterminds; \ export TARGET=/go/src/github.com/Masterminds; \
mkdir -p ${TARGET} && \ mkdir -p ${TARGET} && \