toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ppc64le] update make deb go download link

Browse Source 
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>
Upstream-commit: 629e85ad8975046eba3a88fdc8448759525e27bd
Component: engine
This commit is contained in:
Christopher Jones
2016-11-03 15:26:28 -04:00
parent e82a3896c3
commit dc399e49f2
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/contrib/builder/deb/ppc64le/generate.sh
+1 -1
View File
@@ -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"
components/engine/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile
+5 -1
View File
@@ -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 \
components/engine/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile
+1 -1
View File
@@ -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