1. docker
  2. Commit 12e2c2687e5c1f47287aa3668c8853ee8b5d6706
Browse code

Bump go to 1.7

Signed-off-by: Antonio Murdaca <runcom@redhat.com>

Antonio Murdaca authored on 2016/06/03 22:09:53
Showing 24 changed files
Dockerfile
History View file @ 12e2c26
... ... 
@@ -120,7 +120,7 @@ RUN set -x \
120 120 
 # IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines
121 121 
 #            will need updating, to avoid errors. Ping #docker-maintainers on IRC
122 122 
 #            with a heads-up.
123 
-ENV GO_VERSION 1.6.3
123 
+ENV GO_VERSION 1.7
124 124 
 RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" \
125 125 
 	| tar -xzC /usr/local
126 126
Dockerfile.aarch64
History View file @ 12e2c26
... ... 
@@ -100,7 +100,7 @@ RUN set -x \
100 100 
 # so we use gccgo as bootstrap to build Go from source code.
101 101 
 # We don't use the official ARMv6 released binaries as a GOROOT_BOOTSTRAP, because
102 102 
 # not all ARM64 platforms support 32-bit mode. 32-bit mode is optional for ARMv8.
103 
-ENV GO_VERSION 1.6.3
103 
+ENV GO_VERSION 1.7
104 104 
 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 \
105 105 
 	&& cd /usr/src/go/src \
106 106 
 	&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash
Dockerfile.armhf
History View file @ 12e2c26
... ... 
@@ -65,7 +65,7 @@ RUN cd /usr/local/lvm2 \
65 65 
 # see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
66 66
67 67 
 # Install Go
68 
-ENV GO_VERSION 1.6.3
68 
+ENV GO_VERSION 1.7
69 69 
 RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-armv6l.tar.gz" \
70 70 
 	| tar -xzC /usr/local
71 71 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
Dockerfile.ppc64le
History View file @ 12e2c26
... ... 
@@ -89,7 +89,7 @@ RUN set -x \
89 89
90 90 
 ## BUILD GOLANG 1.6
91 91 
 # NOTE: ppc64le has compatibility issues with older versions of go, so make sure the version >= 1.6
92 
-ENV GO_VERSION 1.6.3
92 
+ENV GO_VERSION 1.7
93 93 
 ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz
94 94 
 ENV GOROOT_BOOTSTRAP /usr/local
95 95
Dockerfile.simple
History View file @ 12e2c26
... ... 
@@ -49,7 +49,7 @@ RUN set -x \
49 49 
 # IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines
50 50 
 #            will need updating, to avoid errors. Ping #docker-maintainers on IRC
51 51 
 #            with a heads-up.
52 
-ENV GO_VERSION 1.6.3
52 
+ENV GO_VERSION 1.7
53 53 
 RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" \
54 54 
 	| tar -xzC /usr/local
55 55 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
Dockerfile.windows
History View file @ 12e2c26
... ... 
@@ -34,7 +34,7 @@ FROM windowsservercore
34 34 
 # Environment variable notes:
35 35 
 #  - GO_VERSION must consistent with 'Dockerfile' used by Linux'.
36 36 
 #  - FROM_DOCKERFILE is used for detection of building within a container.
37 
-ENV GO_VERSION=1.6.3 \
37 
+ENV GO_VERSION=1.7 \
38 38 
     GIT_LOCATION=https://github.com/git-for-windows/git/releases/download/v2.7.2.windows.1/Git-2.7.2-64-bit.exe \
39 39 
     GOPATH=C:/go;C:/go/src/github.com/docker/docker/vendor \
40 40 
     FROM_DOCKERFILE=1
contrib/builder/deb/amd64/debian-jessie/Dockerfile
History View file @ 12e2c26
... ... 
@@ -10,7 +10,7 @@ RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list
10 10
11 11 
 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/*
12 12
13 
-ENV GO_VERSION 1.6.3
13 
+ENV GO_VERSION 1.7
14 14 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
15 15 
 ENV PATH $PATH:/usr/local/go/bin
16 16
contrib/builder/deb/amd64/debian-stretch/Dockerfile
History View file @ 12e2c26
... ... 
@@ -10,7 +10,7 @@ RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list
10 10
11 11 
 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/*
12 12
13 
-ENV GO_VERSION 1.6.3
13 
+ENV GO_VERSION 1.7
14 14 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
15 15 
 ENV PATH $PATH:/usr/local/go/bin
16 16
contrib/builder/deb/amd64/debian-wheezy/Dockerfile
History View file @ 12e2c26
... ... 
@@ -12,7 +12,7 @@ RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list.d/backport
12 12 
 RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/*
13 13 
 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/*
14 14
15 
-ENV GO_VERSION 1.6.3
15 
+ENV GO_VERSION 1.7
16 16 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
17 17 
 ENV PATH $PATH:/usr/local/go/bin
18 18
contrib/builder/deb/amd64/ubuntu-precise/Dockerfile
History View file @ 12e2c26
... ... 
@@ -6,7 +6,7 @@ FROM ubuntu:precise
6 6
7 7 
 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/*
8 8
9 
-ENV GO_VERSION 1.6.3
9 
+ENV GO_VERSION 1.7
10 10 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
11 11 
 ENV PATH $PATH:/usr/local/go/bin
12 12
contrib/builder/deb/amd64/ubuntu-trusty/Dockerfile
History View file @ 12e2c26
... ... 
@@ -6,7 +6,7 @@ FROM ubuntu:trusty
6 6
7 7 
 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/*
8 8
9 
-ENV GO_VERSION 1.6.3
9 
+ENV GO_VERSION 1.7
10 10 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
11 11 
 ENV PATH $PATH:/usr/local/go/bin
12 12
contrib/builder/deb/amd64/ubuntu-wily/Dockerfile
History View file @ 12e2c26
... ... 
@@ -6,7 +6,7 @@ FROM ubuntu:wily
6 6
7 7 
 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/*
8 8
9 
-ENV GO_VERSION 1.6.3
9 
+ENV GO_VERSION 1.7
10 10 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
11 11 
 ENV PATH $PATH:/usr/local/go/bin
12 12
contrib/builder/deb/amd64/ubuntu-xenial/Dockerfile
History View file @ 12e2c26
... ... 
@@ -6,7 +6,7 @@ FROM ubuntu:xenial
6 6
7 7 
 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/*
8 8
9 
-ENV GO_VERSION 1.6.3
9 
+ENV GO_VERSION 1.7
10 10 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
11 11 
 ENV PATH $PATH:/usr/local/go/bin
12 12
contrib/builder/deb/armhf/debian-jessie/Dockerfile
History View file @ 12e2c26
... ... 
@@ -6,7 +6,7 @@ RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list
6 6
7 7 
 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 libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
8 8
9 
-ENV GO_VERSION 1.6.3
9 
+ENV GO_VERSION 1.7
10 10 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local
11 11 
 ENV PATH $PATH:/usr/local/go/bin
12 12
contrib/builder/deb/armhf/raspbian-jessie/Dockerfile
History View file @ 12e2c26
... ... 
@@ -6,7 +6,8 @@ RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list
6 6
7 7 
 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 libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
8 8
9 
-ENV GO_VERSION 1.6.3
9 
+ENV GO_VERSION 1.7
10 
+# GOARM is the ARM architecture version which is unrelated to the above Golang version
10 11 
 ENV GOARM 6
11 12 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local
12 13 
 ENV PATH $PATH:/usr/local/go/bin
contrib/builder/deb/armhf/ubuntu-trusty/Dockerfile
History View file @ 12e2c26
... ... 
@@ -2,7 +2,7 @@ FROM armhf/ubuntu:trusty
2 2
3 3 
 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 libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
4 4
5 
-ENV GO_VERSION 1.6.3
5 
+ENV GO_VERSION 1.7
6 6 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local
7 7 
 ENV PATH $PATH:/usr/local/go/bin
8 8
contrib/builder/rpm/amd64/centos-7/Dockerfile
History View file @ 12e2c26
... ... 
@@ -8,7 +8,7 @@ RUN yum groupinstall -y "Development Tools"
8 8 
 RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs
9 9 
 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
10 10
11 
-ENV GO_VERSION 1.6.3
11 
+ENV GO_VERSION 1.7
12 12 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
13 13 
 ENV PATH $PATH:/usr/local/go/bin
14 14
contrib/builder/rpm/amd64/fedora-22/Dockerfile
History View file @ 12e2c26
... ... 
@@ -7,7 +7,7 @@ FROM fedora:22
7 7 
 RUN dnf install -y @development-tools fedora-packager
8 8 
 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
9 9
10 
-ENV GO_VERSION 1.6.3
10 
+ENV GO_VERSION 1.7
11 11 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
12 12 
 ENV PATH $PATH:/usr/local/go/bin
13 13
contrib/builder/rpm/amd64/fedora-23/Dockerfile
History View file @ 12e2c26
... ... 
@@ -7,7 +7,7 @@ FROM fedora:23
7 7 
 RUN dnf install -y @development-tools fedora-packager
8 8 
 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
9 9
10 
-ENV GO_VERSION 1.6.3
10 
+ENV GO_VERSION 1.7
11 11 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
12 12 
 ENV PATH $PATH:/usr/local/go/bin
13 13
contrib/builder/rpm/amd64/fedora-24/Dockerfile
History View file @ 12e2c26
... ... 
@@ -7,7 +7,7 @@ FROM fedora:24
7 7 
 RUN dnf install -y @development-tools fedora-packager
8 8 
 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
9 9
10 
-ENV GO_VERSION 1.6.3
10 
+ENV GO_VERSION 1.7
11 11 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
12 12 
 ENV PATH $PATH:/usr/local/go/bin
13 13
contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile
History View file @ 12e2c26
... ... 
@@ -7,7 +7,7 @@ FROM opensuse:13.2
7 7 
 RUN zypper --non-interactive install ca-certificates* curl gzip rpm-build
8 8 
 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
9 9
10 
-ENV GO_VERSION 1.6.3
10 
+ENV GO_VERSION 1.7
11 11 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
12 12 
 ENV PATH $PATH:/usr/local/go/bin
13 13
contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile
History View file @ 12e2c26
... ... 
@@ -10,7 +10,7 @@ RUN yum install -y kernel-uek-devel-4.1.12-32.el6uek
10 10 
 RUN yum groupinstall -y "Development Tools"
11 11 
 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
12 12
13 
-ENV GO_VERSION 1.6.3
13 
+ENV GO_VERSION 1.7
14 14 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
15 15 
 ENV PATH $PATH:/usr/local/go/bin
16 16
contrib/builder/rpm/amd64/oraclelinux-7/Dockerfile
History View file @ 12e2c26
... ... 
@@ -7,7 +7,7 @@ FROM oraclelinux:7
7 7 
 RUN yum groupinstall -y "Development Tools"
8 8 
 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
9 9
10 
-ENV GO_VERSION 1.6.3
10 
+ENV GO_VERSION 1.7
11 11 
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
12 12 
 ENV PATH $PATH:/usr/local/go/bin
13 13
hack/make.sh
History View file @ 12e2c26
... ... 
@@ -115,7 +115,7 @@ if [ "$AUTO_GOPATH" ]; then
115 115 
 	if [ "$(go env GOOS)" = 'solaris' ]; then
116 116 
 		# sys/unix is installed outside the standard library on solaris
117 117 
 		# TODO need to allow for version change, need to get version from go
118 
-		export GO_VERSION=${GO_VERSION:-"1.6.3"}
118 
+		export GO_VERSION=${GO_VERSION:-"1.7"}
119 119 
 		export GOPATH="${GOPATH}:/usr/lib/gocode/${GO_VERSION}"
120 120 
 	fi
121 121 
 fi