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

@@ -65,6 +65,8 @@ 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

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

 	| tar -xzC /usr/local

@@ -73,9 +73,9 @@ RUN cd /usr/local/lvm2 \

 ## 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

+ENV GO_VERSION 1.6.1

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

-ENV GO_DOWNLOAD_SHA256 a96cce8ce43a9bf9b2a4c7d470bc7ee0cb00410da815980681c8353218dcf146

+ENV GO_DOWNLOAD_SHA256 1d4b53cdee51b2298afcf50926a7fa44b286f0bf24ff8323ce690a66daa7193f

 ENV GOROOT_BOOTSTRAP /usr/local

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

@@ -6,7 +6,7 @@ FROM debian:jessie

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

+ENV GO_VERSION 1.5.4

 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 debian:stretch

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

+ENV GO_VERSION 1.5.4

 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 debian:wheezy-backports

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

+ENV GO_VERSION 1.5.4

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

+ENV GO_VERSION 1.5.4

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

+ENV GO_VERSION 1.5.4

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

+ENV GO_VERSION 1.5.4

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

+ENV GO_VERSION 1.5.4

 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  libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git

-ENV GO_VERSION 1.5.3

+ENV GO_VERSION 1.5.4

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

+ENV GO_VERSION 1.5.4

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

+ENV GO_VERSION 1.5.4

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

+ENV GO_VERSION 1.5.4

 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 btrfs-progs-devel device-mapper-devel glibc-static  libselinu

 RUN yum install -y yum-utils && curl -o /etc/yum.repos.d/public-yum-ol6.repo http://yum.oracle.com/public-yum-ol6.repo && yum-config-manager -q --enable ol6_UEKR4

 RUN yum install -y kernel-uek-devel-4.1.12-32.el6uek

-ENV GO_VERSION 1.5.3

+ENV GO_VERSION 1.5.4

 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  libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git

-ENV GO_VERSION 1.5.3

+ENV GO_VERSION 1.5.4

 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