@@ -127,19 +127,10 @@ 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.5.4

+ENV GO_VERSION 1.6.2

 RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" \

 	| tar -xzC /usr/local

-# !!! TEMPORARY HACK !!!

-# Because of https://github.com/golang/go/issues/15286 we have to revert to Go 1.5.3 for windows/amd64 in master

-# To change which version of Go to compile with, simply prepend PATH with /usr/local/go1.5.3/bin

-# and set GOROOT to /usr/local/go1.5.3

-ENV HACK_GO_VERSION 1.5.3

-RUN curl -fsSL "https://storage.googleapis.com/golang/go${HACK_GO_VERSION}.linux-amd64.tar.gz" \

-	| tar -xzC /tmp \

-	&& mv /tmp/go "/usr/local/go${HACK_GO_VERSION}"

-

 ENV PATH /go/bin:/usr/local/go/bin:$PATH

 ENV GOPATH /go:/go/src/github.com/docker/docker/vendor

@@ -96,7 +96,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.5.4

+ENV GO_VERSION 1.6.2

 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,9 +65,7 @@ RUN cd /usr/local/lvm2 \

 # see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL

 # Install Go

-# TODO Update to 1.5.4 once available, or build from source, as these builds

-# are marked "end of life", see http://dave.cheney.net/unofficial-arm-tarballs

-ENV GO_VERSION 1.5.3

+ENV GO_VERSION 1.6.2

 RUN curl -fsSL "http://dave.cheney.net/paste/go${GO_VERSION}.linux-arm.tar.gz" \

 	| tar -xzC /usr/local

 ENV PATH /go/bin:/usr/local/go/bin:$PATH

@@ -6,7 +6,7 @@

 # docker build -t docker -f Dockerfile.gccgo .

 #

-FROM gcc:5.3

+FROM gcc:6.1

 # Packaged dependencies

 RUN apt-get update && apt-get install -y \

@@ -15,7 +15,7 @@

 # the case. Therefore, you don't have to disable it anymore.

 #

-FROM ppc64le/gcc:5.3

+FROM ppc64le/gcc:6.1

 # Packaged dependencies

 RUN apt-get update && apt-get install -y \

@@ -49,7 +49,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.5.3

+ENV GO_VERSION 1.6.2

 RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" \

 	| tar -xzC /usr/local

 ENV PATH /go/bin:/usr/local/go/bin:$PATH

@@ -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.5.3 \

+ENV GO_VERSION=1.6.2 \

     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.5.4

+ENV GO_VERSION 1.6.2

 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

@@ -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 libseccomp-dev libsqlite3-dev pkg-config libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.5.4

+ENV GO_VERSION 1.6.2

 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

@@ -12,7 +12,7 @@ RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list.d/backport

 RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/*

 RUN apt-get update && apt-get install -y apparmor bash-completion  build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev  libsqlite3-dev pkg-config --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.5.4

+ENV GO_VERSION 1.6.2

 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

@@ -6,7 +6,7 @@ FROM ubuntu:precise

 RUN apt-get update && apt-get install -y apparmor bash-completion  build-essential curl ca-certificates debhelper dh-apparmor  git libapparmor-dev  libltdl-dev  libsqlite3-dev pkg-config --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.5.4

+ENV GO_VERSION 1.6.2

 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

@@ -6,7 +6,7 @@ FROM 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 libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.5.4

+ENV GO_VERSION 1.6.2

 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

@@ -6,7 +6,7 @@ FROM ubuntu:wily

 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 libseccomp-dev libsqlite3-dev pkg-config libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.5.4

+ENV GO_VERSION 1.6.2

 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

@@ -6,7 +6,7 @@ FROM 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 libseccomp-dev libsqlite3-dev pkg-config libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.5.4

+ENV GO_VERSION 1.6.2

 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

@@ -8,7 +8,7 @@ RUN yum groupinstall -y "Development Tools"

 RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs

 RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git

-ENV GO_VERSION 1.5.4

+ENV GO_VERSION 1.6.2

 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

@@ -7,7 +7,7 @@ FROM fedora:22

 RUN dnf install -y @development-tools fedora-packager

 RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git

-ENV GO_VERSION 1.5.4

+ENV GO_VERSION 1.6.2

 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

@@ -7,7 +7,7 @@ FROM fedora:23

 RUN dnf install -y @development-tools fedora-packager

 RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git

-ENV GO_VERSION 1.5.4

+ENV GO_VERSION 1.6.2

 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

@@ -7,7 +7,7 @@ FROM opensuse:13.2

 RUN zypper --non-interactive install ca-certificates* curl gzip rpm-build

 RUN zypper --non-interactive install libbtrfs-devel device-mapper-devel glibc-static  libselinux-devel libtool-ltdl-devel pkg-config selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git systemd-rpm-macros

-ENV GO_VERSION 1.5.4

+ENV GO_VERSION 1.6.2

 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

@@ -10,7 +10,7 @@ RUN yum install -y kernel-uek-devel-4.1.12-32.el6uek

 RUN yum groupinstall -y "Development Tools"

 RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static  libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel  tar git

-ENV GO_VERSION 1.5.4

+ENV GO_VERSION 1.6.2

 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

@@ -7,7 +7,7 @@ FROM oraclelinux:7

 RUN yum groupinstall -y "Development Tools"

 RUN yum install -y --enablerepo=ol7_optional_latest btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git

-ENV GO_VERSION 1.5.4

+ENV GO_VERSION 1.6.2

 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