GitList

Browse code

bump Go to 1.6.3

following the announcement;
https://groups.google.com/forum/m/#!topic/golang-announce/7JTsd70ZAT0

> [security] Go 1.6.3 and Go 1.7rc2 pre-announcement
>
> Hello gophers,
> We plan to issue Go 1.6.3 and Go 1.7rc2 on Monday July 18 at approximately 2am UTC.
> These are minor release to fix a security issue.
>
> Following our policy at https://golang.org/security, this is the pre-announcement of those releases.
>
> Because we are so late in the release cycle for Go 1.7, we will not issue a minor release of Go 1.5.
> Additionally, we plan to issue Go 1.7rc3 later next week, which will include any changes between 1.7rc1 and tip.
>
> Cheers,
> Chris on behalf of the Go team

**Note:**
the man/Dockerfile is not yet updated, because
the official image for Go 1.6.2 has not yet
been updated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 589bafddf391cbf6aff8b22044266dc819cdcaeb)
Signed-off-by: Tibor Vass <tibor@docker.com>

Sebastiaan van Stijn authored on 2016/07/18 18:52:27
Showing 26 changed files

Dockerfile index b6158ff..10bfd70 100644
Dockerfile.aarch64 index f662cac..10ecdd6 100644
Dockerfile.armhf index 6592ddd..5e8ec93 100644
Dockerfile.ppc64le index a605c9b..2715a30 100644
Dockerfile.simple index 0a6ffab..8d9c184 100644
Dockerfile.windows index 196f902..698439f 100644
contrib/builder/deb/amd64/debian-jessie/Dockerfile index 499137d..42a30b7 100644
contrib/builder/deb/amd64/debian-stretch/Dockerfile index 6393fa1..973ebb0 100644
contrib/builder/deb/amd64/debian-wheezy/Dockerfile index 08bb9f8..069bf51 100644
contrib/builder/deb/amd64/ubuntu-precise/Dockerfile index efb11ec..3000443 100644
contrib/builder/deb/amd64/ubuntu-trusty/Dockerfile index 1cfa667..b3af745 100644
contrib/builder/deb/amd64/ubuntu-wily/Dockerfile index 88cb52a..a12fa71 100644
contrib/builder/deb/amd64/ubuntu-xenial/Dockerfile index 14e8a1c..b114daf 100644
contrib/builder/deb/armhf/debian-jessie/Dockerfile index cdaa1b2..be6eb27 100644
contrib/builder/deb/armhf/raspbian-jessie/Dockerfile index 3272fb0..5cbee7c 100644
contrib/builder/deb/armhf/ubuntu-trusty/Dockerfile index d56517e..fceefea 100644
contrib/builder/rpm/amd64/centos-7/Dockerfile index 4cdbe2e..3d06655 100644
contrib/builder/rpm/amd64/fedora-22/Dockerfile index 23cd4aa..b415410 100644
contrib/builder/rpm/amd64/fedora-23/Dockerfile index 6d9843b..424840b 100644
contrib/builder/rpm/amd64/fedora-24/Dockerfile index 8779f98..3609139 100644
contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile index f077144..62952a5 100644
contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile index 0abca3a..c47e5ab 100644
contrib/builder/rpm/amd64/oraclelinux-7/Dockerfile index 34415b0..af6121c 100644
docs/reference/api/docker_remote_api_v1.24.md index d96412a..5161b0f 100644
hack/make.sh index 3eb6a47..02db1d1 100755
man/Dockerfile index f04cd56..e513ed1 100644

@@ -120,7 +120,7 @@ RUN set -x \
                      # IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines
                      #            will need updating, to avoid errors. Ping #docker-maintainers on IRC
                      #            with a heads-up.
                     -ENV GO_VERSION 1.6.2
                     +ENV GO_VERSION 1.6.3
                      RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" \
                      	| tar -xzC /usr/local

@@ -97,7 +97,7 @@ RUN set -x \
                      # We don't have official binary tarballs for ARM64, eigher for Go or bootstrap,
                      # so we use the official armv6 released binaries as a GOROOT_BOOTSTRAP, and
                      # build Go from source code.
                     -ENV GO_VERSION 1.6.2
                     +ENV GO_VERSION 1.6.3
                      RUN mkdir /usr/src/go && curl -fsSL https://storage.googleapis.com/golang/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/src/go -xz --strip-components=1 \
                      	&& cd /usr/src/go/src \
                      	&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash

@@ -65,7 +65,7 @@ RUN cd /usr/local/lvm2 \
                      # see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
                      # Install Go
                     -ENV GO_VERSION 1.6.2
                     +ENV GO_VERSION 1.6.3
                      RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-armv6l.tar.gz" \
                      	| tar -xzC /usr/local
                      ENV PATH /go/bin:/usr/local/go/bin:$PATH

@@ -89,7 +89,7 @@ RUN set -x \
                      ## BUILD GOLANG 1.6
                      # NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6
                     -ENV GO_VERSION 1.6.2
                     +ENV GO_VERSION 1.6.3
                      ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz
                      ENV GO_DOWNLOAD_SHA256 787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc
                      ENV GOROOT_BOOTSTRAP /usr/local

@@ -34,7 +34,7 @@ FROM windowsservercore
                      # Environment variable notes:
                      #  - GO_VERSION must consistent with 'Dockerfile' used by Linux'.
                      #  - FROM_DOCKERFILE is used for detection of building within a container.
                     -ENV GO_VERSION=1.6.2 \
                     +ENV GO_VERSION=1.6.3 \
                          GIT_LOCATION=https://github.com/git-for-windows/git/releases/download/v2.7.2.windows.1/Git-2.7.2-64-bit.exe \
                          GOPATH=C:/go;C:/go/src/github.com/docker/docker/vendor \
                          FROM_DOCKERFILE=1

@@ -10,7 +10,7 @@ RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list
                      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 libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
                     -ENV GO_VERSION 1.6.2
                     +ENV GO_VERSION 1.6.3
                      RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
                      ENV PATH $PATH:/usr/local/go/bin

@@ -2284,7 +2284,7 @@ Show the docker version information
                               "Version": "1.12.0",
                               "Os": "linux",
                               "KernelVersion": "3.19.0-23-generic",
                     -         "GoVersion": "go1.6.2",
                     +         "GoVersion": "go1.6.3",
                               "GitCommit": "deadbee",
                               "Arch": "amd64",
                               "ApiVersion": "1.24",

@@ -118,7 +118,8 @@ if [ "$AUTO_GOPATH" ]; then
                      	if [ "$(go env GOOS)" = 'solaris' ]; then
                      		# sys/unix is installed outside the standard library on solaris
                      		# TODO need to allow for version change, need to get version from go
                     -		export GOPATH="${GOPATH}:/usr/lib/gocode/1.6.2"
                     +		export GO_VERSION=${GO_VERSION:-"1.6.3"}
                     +		export GOPATH="${GOPATH}:/usr/lib/gocode/${GO_VERSION}"
                      	fi
                      fi

@@ -1,4 +1,4 @@
                     -FROM golang:1.6.2
                     +FROM golang:1.6.3
                      RUN mkdir -p /go/src/github.com/cpuguy83
                      RUN mkdir -p /go/src/github.com/cpuguy83 \
                          && git clone -b v1.0.5 https://github.com/cpuguy83/go-md2man.git /go/src/github.com/cpuguy83/go-md2man \