@@ -86,7 +86,7 @@ RUN apt-get update && apt-get install -y \

 #            will need updating, to avoid errors. Ping #docker-maintainers on IRC

 #            with a heads-up.

 # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

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

 	| tar -xzC /usr/local

@@ -35,10 +35,8 @@ RUN apt-get update && apt-get install -y \

 	createrepo \

 	curl \

 	dpkg-sig \

-	g++ \

 	gcc \

 	git \

-	golang \

 	iptables \

 	jq \

 	less \

@@ -74,15 +72,12 @@ RUN apt-get update && apt-get install -y \

 	--no-install-recommends

 # Install Go

-# We don't have official binary golang 1.7.5 tarballs for ARM64, either for Go or

-# bootstrap, so we use Debian golang (1.7) as bootstrap to build Go from source code.

 # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored

-ENV GO_VERSION 1.8.4

-RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/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

+ENV GO_VERSION 1.8.5

+RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" \

+	| tar -xzC /usr/local

-ENV PATH /go/bin:/usr/src/go/bin:$PATH

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

 ENV GOPATH /go

 # Only install one version of the registry, because old version which support

@@ -63,7 +63,7 @@ RUN apt-get update && apt-get install -y \

 # Install Go

 # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" \

 	| tar -xzC /usr/local

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

@@ -1,5 +1,5 @@

 ## Step 1: Build tests

-FROM golang:1.8.4-alpine3.6 as builder

+FROM golang:1.8.5-alpine3.6 as builder

 RUN apk add --update \

     bash \

@@ -64,7 +64,7 @@ RUN apt-get update && apt-get install -y \

 # Install Go

 # NOTE: official ppc64le go binaries weren't available until go 1.6.4 and 1.7.4

 # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" \

 	| tar -xzC /usr/local

@@ -58,7 +58,7 @@ RUN apt-get update && apt-get install -y \

 	--no-install-recommends

 # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" \

 	| tar -xzC /usr/local

@@ -40,7 +40,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \

 #            will need updating, to avoid errors. Ping #docker-maintainers on IRC

 #            with a heads-up.

 # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

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

 	| tar -xzC /usr/local

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

@@ -161,7 +161,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref

 # Environment variable notes:

 #  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.

 #  - FROM_DOCKERFILE is used for detection of building within a container.

-ENV GO_VERSION=1.8.4 `

+ENV GO_VERSION=1.8.5 `

     GIT_VERSION=2.11.1 `

     GOPATH=C:\go `

     FROM_DOCKERFILE=1

@@ -5,21 +5,13 @@

 FROM aarch64/debian:jessie

 RUN echo deb http://ftp.debian.org/debian jessie-backports main > /etc/apt/sources.list.d/backports.list

-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libsystemd-journal-dev golang-1.6-go libseccomp-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

+RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libsystemd-journal-dev libseccomp-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-RUN update-alternatives --install /usr/bin/go go /usr/lib/go-1.6/bin/go 100

-

-# Install Go

-# aarch64 doesn't have official go binaries, so use the version of go installed from

-# the image to build go from source.

-ENV GO_VERSION 1.8.4

-RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/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

-

-ENV PATH /usr/src/go/bin:$PATH

+ENV GO_VERSION 1.8.5

+RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local

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

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor selinux seccomp

-ENV RUNC_BUILDTAGS apparmor selinux seccomp

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

+ENV RUNC_BUILDTAGS apparmor seccomp selinux

@@ -4,19 +4,13 @@

 FROM aarch64/debian:stretch

-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libsystemd-dev golang-go libseccomp-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

+RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libsystemd-dev libseccomp-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-# Install Go

-# aarch64 doesn't have official go binaries, so use the version of go installed from

-# the image to build go from source.

-ENV GO_VERSION 1.8.4

-RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/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

-

-ENV PATH /usr/src/go/bin:$PATH

+ENV GO_VERSION 1.8.5

+RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local

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

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor selinux seccomp

-ENV RUNC_BUILDTAGS apparmor selinux seccomp

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

+ENV RUNC_BUILDTAGS apparmor seccomp selinux

@@ -38,7 +38,7 @@ for version in "${versions[@]}"; do

 	EOF

-	dockerBuildTags='apparmor selinux'

+	extraBuildTags='apparmor selinux'

 	runcBuildTags='apparmor selinux'

 	# this list is sorted alphabetically; please keep it that way

@@ -62,29 +62,20 @@ for version in "${versions[@]}"; do

 	case "$suite" in

 		trusty)

 			packages+=( libsystemd-journal-dev )

-			# aarch64 doesn't have an official downloadable binary for go.

-			# And gccgo for trusty only includes Go 1.2 implementation which

-			# is too old to build current go source, fortunately trusty has

-			# golang-1.6-go package can be used as bootstrap.

-			packages+=( golang-1.6-go )

 			;;

 		jessie)

 			packages+=( libsystemd-journal-dev )

-			# aarch64 doesn't have an official downloadable binary for go.

-			# And gccgo for jessie only includes Go 1.2 implementation which

-			# is too old to build current go source, fortunately jessie backports

-			# has golang-1.6-go package can be used as bootstrap.

-			packages+=( golang-1.6-go libseccomp-dev )

-

-			dockerBuildTags="$dockerBuildTags seccomp"

-			runcBuildTags="$runcBuildTags seccomp"

+			packages+=( libseccomp-dev )

+

+			extraBuildTags+=' seccomp'

+			runcBuildTags+=' seccomp'

 			;;

 		stretch|xenial)

 			packages+=( libsystemd-dev )

-			packages+=( golang-go libseccomp-dev )

+			packages+=( libseccomp-dev )

-			dockerBuildTags="$dockerBuildTags seccomp"

-			runcBuildTags="$runcBuildTags seccomp"

+			extraBuildTags+=' seccomp'

+			runcBuildTags+=' seccomp'

 			;;

 		*)

 			echo "Unsupported distro:" $distro:$suite

@@ -105,31 +96,17 @@ for version in "${versions[@]}"; do

 	echo "RUN apt-get update && apt-get install -y ${packages[*]} --no-install-recommends && rm -rf /var/lib/apt/lists/*" >> "$version/Dockerfile"

 	echo >> "$version/Dockerfile"

-	case "$suite" in

-		jessie|trusty)

-			echo 'RUN update-alternatives --install /usr/bin/go go /usr/lib/go-1.6/bin/go 100' >> "$version/Dockerfile"

-			echo >> "$version/Dockerfile"

-			;;

-		*)

-			;;

-	esac

-

-	echo "# Install Go" >> "$version/Dockerfile"

-	echo "# aarch64 doesn't have official go binaries, so use the version of go installed from" >> "$version/Dockerfile"

-	echo "# the image to build go from source." >> "$version/Dockerfile"

-

 	awk '$1 == "ENV" && $2 == "GO_VERSION" { print; exit }' ../../../../Dockerfile.aarch64 >> "$version/Dockerfile"

-	echo 'RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/src/go -xz --strip-components=1 \' >> "$version/Dockerfile"

-	echo '	&& cd /usr/src/go/src \' >> "$version/Dockerfile"

-	echo '	&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash' >> "$version/Dockerfile"

-	echo >> "$version/Dockerfile"

-

-	echo 'ENV PATH /usr/src/go/bin:$PATH' >> "$version/Dockerfile"

+	echo 'RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local' >> "$version/Dockerfile"

+	echo 'ENV PATH $PATH:/usr/local/go/bin' >> "$version/Dockerfile"

 	echo >> "$version/Dockerfile"

-	echo "ENV AUTO_GOPATH 1" >> "$version/Dockerfile"

+	echo 'ENV AUTO_GOPATH 1' >> "$version/Dockerfile"

 	echo >> "$version/Dockerfile"

-	echo "ENV DOCKER_BUILDTAGS $dockerBuildTags" >> "$version/Dockerfile"

+	# print build tags in alphabetical order

+	buildTags=$( echo "$extraBuildTags" | xargs -n1 | sort -n | tr '\n' ' ' | sed -e 's/[[:space:]]*$//' )

+	runcBuildTags=$( echo "$runcBuildTags" | xargs -n1 | sort -n | tr '\n' ' ' | sed -e 's/[[:space:]]*$//' )

+	echo "ENV DOCKER_BUILDTAGS $buildTags" >> "$version/Dockerfile"

 	echo "ENV RUNC_BUILDTAGS $runcBuildTags" >> "$version/Dockerfile"

 done

@@ -4,19 +4,11 @@

 FROM aarch64/ubuntu:trusty

-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libsystemd-journal-dev golang-1.6-go --no-install-recommends && rm -rf /var/lib/apt/lists/*

+RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-RUN update-alternatives --install /usr/bin/go go /usr/lib/go-1.6/bin/go 100

-

-# Install Go

-# aarch64 doesn't have official go binaries, so use the version of go installed from

-# the image to build go from source.

-ENV GO_VERSION 1.8.4

-RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/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

-

-ENV PATH /usr/src/go/bin:$PATH

+ENV GO_VERSION 1.8.5

+RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local

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

 ENV AUTO_GOPATH 1

@@ -4,19 +4,13 @@

 FROM aarch64/ubuntu:xenial

-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libsystemd-dev golang-go libseccomp-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

+RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libsystemd-dev libseccomp-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-# Install Go

-# aarch64 doesn't have official go binaries, so use the version of go installed from

-# the image to build go from source.

-ENV GO_VERSION 1.8.4

-RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/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

-

-ENV PATH /usr/src/go/bin:$PATH

+ENV GO_VERSION 1.8.5

+RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local

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

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor selinux seccomp

-ENV RUNC_BUILDTAGS apparmor selinux seccomp

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

+ENV RUNC_BUILDTAGS apparmor seccomp selinux

@@ -10,7 +10,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list

 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev  pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

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

@@ -10,7 +10,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list

 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

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

@@ -12,7 +12,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list.d

 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 cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev  pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/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 cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev  pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/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 cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

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

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

 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

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

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

 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

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

@@ -10,7 +10,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list

 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev  pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local

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

@@ -10,7 +10,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list

 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev  pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 # GOARM is the ARM architecture version which is unrelated to the above Golang version

 ENV GOARM 6

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local

@@ -6,7 +6,7 @@ FROM armhf/ubuntu:trusty

 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev  pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local

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

@@ -6,7 +6,7 @@ FROM armhf/ubuntu:xenial

 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local

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

@@ -6,7 +6,7 @@ FROM armhf/ubuntu:yakkety

 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local

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

@@ -6,7 +6,7 @@ FROM ppc64le/ubuntu:trusty

 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local

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

@@ -6,7 +6,7 @@ FROM ppc64le/ubuntu:xenial

 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libseccomp-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local

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

@@ -6,7 +6,7 @@ FROM ppc64le/ubuntu:yakkety

 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libseccomp-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local

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

@@ -6,7 +6,7 @@ FROM s390x/ubuntu:xenial

 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libseccomp-dev pkg-config libsystemd-dev vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local

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

@@ -6,7 +6,7 @@ FROM s390x/ubuntu:yakkety

 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libseccomp-dev pkg-config libsystemd-dev vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/*

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local

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

@@ -7,7 +7,7 @@ FROM amazonlinux:latest

 RUN yum groupinstall -y "Development Tools"

 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  tar git cmake vim-common

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/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 systemd-devel tar git cmake vim-common

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

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

@@ -8,7 +8,7 @@ RUN dnf -y upgrade

 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 systemd-devel tar git cmake vim-common

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

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

@@ -8,7 +8,7 @@ RUN dnf -y upgrade

 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 systemd-devel tar git cmake vim-common

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/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 systemd-devel tar git cmake vim systemd-rpm-macros

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/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  tar git cmake vim-common

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/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 systemd-devel tar git cmake vim-common

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

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

@@ -7,7 +7,7 @@ FROM photon:1.0

 RUN tdnf install -y wget curl ca-certificates gzip make rpm-build sed gcc linux-api-headers glibc-devel binutils libseccomp elfutils

 RUN tdnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkg-config selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

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

@@ -9,7 +9,7 @@ RUN yum groupinstall --skip-broken -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 cmake vim-common

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.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 cmake vim-common

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local

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

@@ -8,7 +8,7 @@ RUN dnf -y upgrade

 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 systemd-devel tar git cmake

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local

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

@@ -9,7 +9,7 @@ RUN zypper addrepo -n ppc64le-updates -f https://download.opensuse.org/ports/upd

 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 cmake vim

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local

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

@@ -8,7 +8,7 @@ FROM sinenomine/clefos-base-s390x

 RUN touch /var/lib/rpm/* && yum groupinstall -y "Development Tools"

 RUN touch /var/lib/rpm/* && 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 cmake vim-common

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local

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

@@ -9,7 +9,7 @@ RUN zypper ar https://download.opensuse.org/ports/zsystems/tumbleweed/repo/oss/

 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 cmake vim systemd-rpm-macros

-ENV GO_VERSION 1.8.4

+ENV GO_VERSION 1.8.5

 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local

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