From f6d30c3631abee04aa3586cba36960901f705fe2 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Tue, 6 Jun 2017 19:54:54 +0000 Subject: [PATCH] set $GOPATH/bin for s390x Signed-off-by: Andrew Hsu --- deb/ubuntu-xenial/Dockerfile.s390x | 4 +--- deb/ubuntu-yakkety/Dockerfile.s390x | 4 +--- deb/ubuntu-zesty/Dockerfile.s390x | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/deb/ubuntu-xenial/Dockerfile.s390x b/deb/ubuntu-xenial/Dockerfile.s390x index 9e4085d8861..08e6ded7a1d 100644 --- 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 index c50d678ef4d..129e58fa885 100644 --- 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 index 46ee96101e5..91f03a144fd 100644 --- 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