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

 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

@@ -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.3

+ENV GO_VERSION 1.5.4

 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

@@ -74,10 +74,10 @@ RUN cd /usr/local/lvm2 \

 # TODO install Go, using gccgo as GOROOT_BOOTSTRAP (Go 1.5+ supports ppc64le properly)

 # possibly a ppc64le/golang image?

-## BUILD GOLANG 1.5.3

-ENV GO_VERSION 1.5.3

+## BUILD GOLANG

+ENV GO_VERSION 1.5.4

 ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz

-ENV GO_DOWNLOAD_SHA256 a96cce8ce43a9bf9b2a4c7d470bc7ee0cb00410da815980681c8353218dcf146

+ENV GO_DOWNLOAD_SHA256 002acabce7ddc140d0d55891f9d4fcfbdd806b9332fb8b110c91bc91afb0bc93

 ENV GOROOT_BOOTSTRAP /usr/local

 RUN curl -fsSL "$GO_DOWNLOAD_URL" -o golang.tar.gz \