set $GOPATH/bin for s390x

Signed-off-by: Andrew Hsu <[email protected]>
docker-archive · Jun 6, 2017 · f6d30c3 · f6d30c3
1 parent d3e0c2e
commit f6d30c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/deb/ubuntu-xenial/Dockerfile.s390x b/deb/ubuntu-xenial/Dockerfile.s390x
@@ -4,10 +4,8 @@ RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools bu
 
 ENV GO_VERSION 1.8.3
 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
 ENV GOPATH /go
-
+ENV PATH $PATH:/usr/local/go/bin:/$GOPATH/bin
 ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
 ENV RUNC_BUILDTAGS apparmor selinux
 

diff --git a/deb/ubuntu-yakkety/Dockerfile.s390x b/deb/ubuntu-yakkety/Dockerfile.s390x
@@ -4,10 +4,8 @@ RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools bu
 
 ENV GO_VERSION 1.8.3
 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
 ENV GOPATH /go
-
+ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
 ENV RUNC_BUILDTAGS apparmor selinux
 

diff --git a/deb/ubuntu-zesty/Dockerfile.s390x b/deb/ubuntu-zesty/Dockerfile.s390x
@@ -4,10 +4,8 @@ RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools bu
 
 ENV GO_VERSION 1.8.3
 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
 ENV GOPATH /go
-
+ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
 ENV RUNC_BUILDTAGS apparmor seccomp selinux