Browse code
[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 <tophj@linux.vnet.ibm.com>
Christopher Jones authored on 2016/11/04 04:26:28Showing 3 changed files
- contrib/builder/deb/ppc64le/generate.sh
- contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile
- contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile
| ... | ... |
@@ -99,7 +99,7 @@ for version in "${versions[@]}"; do
|
| 99 | 99 |
# ppc64le doesn't have an official downloadable binary as of go 1.6.2. so use the |
| 100 | 100 |
# older packaged go(v1.6.1) to bootstrap latest go, then remove the packaged go |
| 101 | 101 |
echo "# Install Go" >> "$version/Dockerfile" |
| 102 |
- echo "# ppc64le doesn't have official go binaries, so use the version of go installed from the image" >> "$version/Dockerfile" |
|
| 102 |
+ echo "# ppc64le doesn't have official go binaries, so use a distro packaged version of go" >> "$version/Dockerfile" |
|
| 103 | 103 |
echo "# to build go from source." >> "$version/Dockerfile" |
| 104 | 104 |
echo "# NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6" >> "$version/Dockerfile" |
| 105 | 105 |
|
| ... | ... |
@@ -6,8 +6,12 @@ FROM ppc64le/ubuntu:trusty |
| 6 | 6 |
|
| 7 | 7 |
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/* |
| 8 | 8 |
|
| 9 |
+# Install Go |
|
| 10 |
+# ppc64le doesn't have official go binaries, so use a distro packaged version of go |
|
| 11 |
+# to build go from source. |
|
| 12 |
+# NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6 |
|
| 9 | 13 |
ENV GO_VERSION 1.7.3 |
| 10 |
-ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz
|
|
| 14 |
+ENV GO_DOWNLOAD_URL https://storage.googleapis.com/golang/go${GO_VERSION}.src.tar.gz
|
|
| 11 | 15 |
ENV GOROOT_BOOTSTRAP /usr/lib/go-1.6 |
| 12 | 16 |
|
| 13 | 17 |
RUN curl -fsSL "$GO_DOWNLOAD_URL" -o golang.tar.gz \ |
| ... | ... |
@@ -7,7 +7,7 @@ FROM ppc64le/ubuntu:xenial |
| 7 | 7 |
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/* |
| 8 | 8 |
|
| 9 | 9 |
# Install Go |
| 10 |
-# ppc64le doesn't have official go binaries, so use the version of go installed from the image |
|
| 10 |
+# ppc64le doesn't have official go binaries, so use a distro packaged version of go |
|
| 11 | 11 |
# to build go from source. |
| 12 | 12 |
# NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6 |
| 13 | 13 |
ENV GO_VERSION 1.7.3 |