From 629e85ad8975046eba3a88fdc8448759525e27bd Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Thu, 3 Nov 2016 15:26:28 -0400 Subject: [PATCH] [ppc64le] update make deb go download link Updates the ppc64le `make deb` trusty download link to be consistent with the other Dockerfiles. Also minor clarification to how we install go. Signed-off-by: Christopher Jones --- contrib/builder/deb/ppc64le/generate.sh | 2 +- contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile | 6 +++++- contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/builder/deb/ppc64le/generate.sh b/contrib/builder/deb/ppc64le/generate.sh index c4ebd9c598..e1b3d05dff 100755 --- a/contrib/builder/deb/ppc64le/generate.sh +++ b/contrib/builder/deb/ppc64le/generate.sh @@ -99,7 +99,7 @@ for version in "${versions[@]}"; do # ppc64le doesn't have an official downloadable binary as of go 1.6.2. so use the # older packaged go(v1.6.1) to bootstrap latest go, then remove the packaged go echo "# Install Go" >> "$version/Dockerfile" - echo "# ppc64le doesn't have official go binaries, so use the version of go installed from the image" >> "$version/Dockerfile" + echo "# ppc64le doesn't have official go binaries, so use a distro packaged version of go" >> "$version/Dockerfile" echo "# to build go from source." >> "$version/Dockerfile" echo "# NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6" >> "$version/Dockerfile" diff --git a/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile b/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile index d92531cc72..dcdbb41f38 100644 --- a/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile +++ b/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile @@ -6,8 +6,12 @@ FROM ppc64le/ubuntu:trusty RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config golang-1.6 libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* +# Install Go +# ppc64le doesn't have official go binaries, so use a distro packaged version of go +# to build go from source. +# NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6 ENV GO_VERSION 1.7.3 -ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz +ENV GO_DOWNLOAD_URL https://storage.googleapis.com/golang/go${GO_VERSION}.src.tar.gz ENV GOROOT_BOOTSTRAP /usr/lib/go-1.6 RUN curl -fsSL "$GO_DOWNLOAD_URL" -o golang.tar.gz \ diff --git a/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile b/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile index c3db737840..56aa076cf7 100644 --- a/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile +++ b/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile @@ -7,7 +7,7 @@ FROM ppc64le/ubuntu:xenial RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config golang-go libseccomp-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* # Install Go -# ppc64le doesn't have official go binaries, so use the version of go installed from the image +# ppc64le doesn't have official go binaries, so use a distro packaged version of go # to build go from source. # NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6 ENV GO_VERSION 1.7.3