1. docker
  2. Commit 6d324b41920f7238cecc02f9bdfad86d8b3fa258
Browse code

Downgrade to Go 1.5.3.

To not hit the issue with the request Host header.

Signed-off-by: David Calavera <david.calavera@gmail.com>
(cherry picked from commit 3e0bd74a3d2647fa8c7783f4a053ad225746e6eb)

David Calavera authored on 2016/03/25 07:41:34
Showing 19 changed files
Dockerfile
History View file @ 6d324b4
... ... 
@@ -119,7 +119,7 @@ RUN set -x \
119 119 
 # IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines
120 120 
 #            will need updating, to avoid errors. Ping #docker-maintainers on IRC
121 121 
 #            with a heads-up.
122 
-ENV GO_VERSION 1.6
122 
+ENV GO_VERSION 1.5.3
123 123 
 RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" \
124 124 
 	| tar -xzC /usr/local
125 125 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
... ... 
@@ -170,12 +170,13 @@ RUN set -x \
170 170 
 # Install notary server
171 171 
 ENV NOTARY_VERSION docker-v1.11-3
172 172 
 RUN set -x \
173 
+	&& export GO15VENDOREXPERIMENT=1 \
173 174 
 	&& export GOPATH="$(mktemp -d)" \
174 175 
 	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
175 176 
 	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \
176 
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \
177 
+	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
177 178 
 		go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \
178 
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \
179 
+	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
179 180 
 		go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary \
180 181 
 	&& rm -rf "$GOPATH"
181 182
Dockerfile.aarch64
History View file @ 6d324b4
... ... 
@@ -119,12 +119,13 @@ RUN set -x \
119 119 
 # Install notary server
120 120 
 ENV NOTARY_VERSION docker-v1.11-3
121 121 
 RUN set -x \
122 
+	&& export GO15VENDOREXPERIMENT=1 \
122 123 
 	&& export GOPATH="$(mktemp -d)" \
123 124 
 	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
124 125 
 	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \
125 
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \
126 
+	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
126 127 
 		go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \
127 
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \
128 
+	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
128 129 
 		go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary \
129 130 
 	&& rm -rf "$GOPATH"
130 131
Dockerfile.armhf
History View file @ 6d324b4
... ... 
@@ -65,8 +65,8 @@ 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
69 
-RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-armv6l.tar.gz" \
68 
+ENV GO_VERSION 1.5.3
69 
+RUN curl -fsSL "http://dave.cheney.net/paste/go${GO_VERSION}.linux-arm.tar.gz" \
70 70 
 	| tar -xzC /usr/local
71 71 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
72 72 
 ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
... ... 
@@ -128,12 +128,13 @@ RUN set -x \
128 128 
 # Install notary server
129 129 
 ENV NOTARY_VERSION docker-v1.11-3
130 130 
 RUN set -x \
131 
+	&& export GO15VENDOREXPERIMENT=1 \
131 132 
 	&& export GOPATH="$(mktemp -d)" \
132 133 
 	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
133 134 
 	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \
134 
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \
135 
+	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
135 136 
 		go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \
136 
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \
137 
+	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
137 138 
 		go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary \
138 139 
 	&& rm -rf "$GOPATH"
139 140
Dockerfile.ppc64le
History View file @ 6d324b4
... ... 
@@ -74,8 +74,8 @@ RUN cd /usr/local/lvm2 \
74 74 
 # TODO install Go, using gccgo as GOROOT_BOOTSTRAP (Go 1.5+ supports ppc64le properly)
75 75 
 # possibly a ppc64le/golang image?
76 76
77 
-## BUILD GOLANG 1.6
78 
-ENV GO_VERSION 1.6
77 
+## BUILD GOLANG 1.5.3
78 
+ENV GO_VERSION 1.5.3
79 79 
 ENV GO_DOWNLOAD_URL https://golang.org/dl/go${GO_VERSION}.src.tar.gz
80 80 
 ENV GO_DOWNLOAD_SHA256 a96cce8ce43a9bf9b2a4c7d470bc7ee0cb00410da815980681c8353218dcf146
81 81 
 ENV GOROOT_BOOTSTRAP /usr/local
... ... 
@@ -129,12 +129,13 @@ RUN set -x \
129 129 
 # Install notary and notary-server
130 130 
 ENV NOTARY_VERSION docker-v1.11-3
131 131 
 RUN set -x \
132 
+	&& export GO15VENDOREXPERIMENT=1 \
132 133 
 	&& export GOPATH="$(mktemp -d)" \
133 134 
 	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
134 135 
 	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \
135 
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \
136 
+	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
136 137 
 		go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \
137 
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \
138 
+	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
138 139 
 		go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary \
139 140 
 	&& rm -rf "$GOPATH"
140 141
Dockerfile.s390x
History View file @ 6d324b4
... ... 
@@ -110,11 +110,12 @@ RUN set -x \
110 110 
 # Install notary server
111 111 
 ENV NOTARY_VERSION docker-v1.11-3
112 112 
 RUN set -x \
113 
+	&& export GO15VENDOREXPERIMENT=1 \
113 114 
 	&& export GOPATH="$(mktemp -d)" \
114 115 
 	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
115 116 
 	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \
116 
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \
117 
-		go build -gccgoflags=-lpthread -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \
117 
+	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
118 
+		go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \
118 119 
 	&& rm -rf "$GOPATH"
119 120
120 121 
 # Get the "docker-py" source so we can run their integration tests
Dockerfile.windows
History View file @ 6d324b4
... ... 
@@ -38,9 +38,9 @@
38 38 
 FROM windowsservercore
39 39
40 40 
 # Environment variable notes:
41 
-#  - GOLANG_VERSION must consistent with 'Dockerfile' used by Linux'.
41 
+#  - GO_VERSION must consistent with 'Dockerfile' used by Linux'.
42 42 
 #  - FROM_DOCKERFILE is used for detection of building within a container.
43 
-ENV GOLANG_VERSION=1.6 \
43 
+ENV GO_VERSION=1.5.3 \
44 44 
     GIT_LOCATION=https://github.com/git-for-windows/git/releases/download/v2.7.2.windows.1/Git-2.7.2-64-bit.exe \
45 45 
     RSRC_COMMIT=ba14da1f827188454a4591717fff29999010887f \
46 46 
     GOPATH=C:/go;C:/go/src/github.com/docker/docker/vendor \
... ... 
@@ -63,7 +63,7 @@ RUN \
63 63 
   Download-File %GIT_LOCATION% gitsetup.exe; \
64 64 
   \
65 65 
   Write-Host INFO: Downloading go...; \
66 
-  Download-File https://storage.googleapis.com/golang/go%GOLANG_VERSION%.windows-amd64.msi go.msi; \
66 
+  Download-File https://storage.googleapis.com/golang/go%GO_VERSION%.windows-amd64.msi go.msi; \
67 67 
   \
68 68 
   Write-Host INFO: Downloading compiler 1 of 3...; \
69 69 
   Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/gcc.zip gcc.zip; \
contrib/builder/deb/amd64/debian-jessie/Dockerfile
History View file @ 6d324b4
... ... 
@@ -6,7 +6,7 @@ FROM debian:jessie
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
9 
+ENV GO_VERSION 1.5.3
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/debian-stretch/Dockerfile
History View file @ 6d324b4
... ... 
@@ -6,7 +6,7 @@ FROM debian:stretch
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
9 
+ENV GO_VERSION 1.5.3
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/debian-wheezy/Dockerfile
History View file @ 6d324b4
... ... 
@@ -7,7 +7,7 @@ FROM debian:wheezy-backports
7 7 
 RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/*
8 8 
 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/*
9 9
10 
-ENV GO_VERSION 1.6
10 
+ENV GO_VERSION 1.5.3
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/deb/amd64/ubuntu-precise/Dockerfile
History View file @ 6d324b4
... ... 
@@ -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
9 
+ENV GO_VERSION 1.5.3
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 @ 6d324b4
... ... 
@@ -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
9 
+ENV GO_VERSION 1.5.3
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 @ 6d324b4
... ... 
@@ -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
9 
+ENV GO_VERSION 1.5.3
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 @ 6d324b4
... ... 
@@ -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
9 
+ENV GO_VERSION 1.5.3
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/rpm/amd64/centos-7/Dockerfile
History View file @ 6d324b4
... ... 
@@ -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  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
11 
+ENV GO_VERSION 1.5.3
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 @ 6d324b4
... ... 
@@ -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
10 
+ENV GO_VERSION 1.5.3
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 @ 6d324b4
... ... 
@@ -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
10 
+ENV GO_VERSION 1.5.3
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 @ 6d324b4
... ... 
@@ -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
10 
+ENV GO_VERSION 1.5.3
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 @ 6d324b4
... ... 
@@ -10,7 +10,7 @@ RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static  libselinu
10 10 
 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
11 11 
 RUN yum install -y kernel-uek-devel-4.1.12-32.el6uek
12 12
13 
-ENV GO_VERSION 1.6
13 
+ENV GO_VERSION 1.5.3
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 @ 6d324b4
... ... 
@@ -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  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
10 
+ENV GO_VERSION 1.5.3
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