1. docker
  2. Commit 5bec1b686481244698474a0103c0994b25c5c79c
Browse code

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>

Christopher Jones authored on 2017/02/07 04:43:13
Showing 2 changed files
man/Dockerfile.ppc64le
History View file @ 5bec1b6
... ... 
@@ -1,9 +1,19 @@
1 1 
 FROM    ppc64le/ubuntu:xenial
2 2
3 
-RUN     apt-get update && apt-get install -y git golang-go
3 
+RUN     apt-get update && apt-get install -y \
4 
+        curl \
5 
+        gcc \
6 
+        git \
7 
+        make \
8 
+        tar
9 
+
10 
+ENV     GO_VERSION 1.7.5
11 
+RUN     curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" \
12 
+        | tar -xzC /usr/local
13 
+ENV     PATH /usr/local/go/bin:$PATH
14 
+ENV     GOPATH=/go
4 15
5 16 
 RUN     mkdir -p /go/src /go/bin /go/pkg
6 
-ENV     GOPATH=/go:/usr/lib/go-1.6
7 17 
 RUN     export GLIDE=v0.11.1; \
8 18 
         export TARGET=/go/src/github.com/Masterminds; \
9 19 
         mkdir -p ${TARGET} && \
man/Dockerfile.s390x
History View file @ 5bec1b6
... ... 
@@ -1,9 +1,19 @@
1 1 
 FROM    s390x/ubuntu:xenial
2 2
3 
-RUN     apt-get update && apt-get install -y git golang-go
3 
+RUN     apt-get update && apt-get install -y \
4 
+        curl \
5 
+        gcc \
6 
+        git \
7 
+        make \
8 
+        tar
9 
+
10 
+ENV     GO_VERSION 1.7.5
11 
+RUN     curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" \
12 
+        | tar -xzC /usr/local
13 
+ENV     PATH /usr/local/go/bin:$PATH
14 
+ENV     GOPATH=/go
4 15
5 16 
 RUN     mkdir -p /go/src /go/bin /go/pkg
6 
-ENV     GOPATH=/go:/usr/lib/go-1.6
7 17 
 RUN     export GLIDE=v0.11.1; \
8 18 
         export TARGET=/go/src/github.com/Masterminds; \
9 19 
         mkdir -p ${TARGET} && \