@@ -32,10 +32,10 @@

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

 #

-FROM golang:1.9.4 AS base

+FROM golang:1.9.5 AS base

 # FIXME(vdemeester) this is kept for other script depending on it to not fail right away

 # Remove this once the other scripts uses something else to detect the version

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.5

 # allow replacing httpredir or deb mirror

 ARG APT_MIRROR=deb.debian.org

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

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

 ## Step 1: Build tests

-FROM golang:1.9.4-alpine3.6 as builder

+FROM golang:1.9.5-alpine3.6 as builder

 RUN apk add --update \

     bash \

@@ -42,7 +42,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.9.4

+ENV GO_VERSION 1.9.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.9.4 `

+ENV GO_VERSION=1.9.5 `

     GIT_VERSION=2.11.1 `

     GOPATH=C:\go `

     FROM_DOCKERFILE=1

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

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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

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

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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

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

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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

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

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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

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

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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.9.4

+ENV GO_VERSION 1.9.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 pkgconfig selinux-policy selinux-policy-devel  tar git cmake vim-common

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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 pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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 pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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 pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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 pkg-config selinux-policy selinux-policy-devel systemd-devel tar git cmake vim systemd-rpm-macros

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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 pkgconfig selinux-policy selinux-policy-devel  tar git cmake vim-common

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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 pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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 pkg-config selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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 pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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 pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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

@@ -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 pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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 pkg-config selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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

@@ -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 pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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 pkg-config selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim systemd-rpm-macros

-ENV GO_VERSION 1.9.4

+ENV GO_VERSION 1.9.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