1. docker
  2. Commit 24d98c14a0ee580018fdfcc465a76fd4a976e40f
Browse code

Switch verbosity in builder/*/generate.sh so that we get download progress for Go instead of the name of every single file extracted

Also, `curl` is smart enough to see when the consumer of the pipe is going slow that it should slow down the transfer, so this gives a reasonable indication of extraction progress too.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>

Tianon Gravi authored on 2015/05/08 05:15:35
Showing 12 changed files
contrib/builder/deb/debian-jessie/Dockerfile
History View file @ 24d98c1
... ... 
@@ -7,7 +7,7 @@ FROM debian:jessie
7 7 
 RUN apt-get update && apt-get install -y bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
8 8
9 9 
 ENV GO_VERSION 1.4.2
10 
-RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xvzC /usr/local
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
13 13 
 ENV AUTO_GOPATH 1
contrib/builder/deb/debian-stretch/Dockerfile
History View file @ 24d98c1
... ... 
@@ -7,7 +7,7 @@ FROM debian:stretch
7 7 
 RUN apt-get update && apt-get install -y bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
8 8
9 9 
 ENV GO_VERSION 1.4.2
10 
-RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xvzC /usr/local
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
13 13 
 ENV AUTO_GOPATH 1
contrib/builder/deb/debian-wheezy/Dockerfile
History View file @ 24d98c1
... ... 
@@ -8,7 +8,7 @@ RUN echo deb http://http.debian.net/debian wheezy-backports main > /etc/apt/sour
8 8 
 RUN apt-get update && apt-get install -y bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
9 9
10 10 
 ENV GO_VERSION 1.4.2
11 
-RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xvzC /usr/local
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
14 14 
 ENV AUTO_GOPATH 1
contrib/builder/deb/generate.sh
History View file @ 24d98c1
... ... 
@@ -59,7 +59,7 @@ for version in "${versions[@]}"; do
59 59 
 	echo >> "$version/Dockerfile"
60 60
61 61 
 	awk '$1 == "ENV" && $2 == "GO_VERSION" { print; exit }' ../../../Dockerfile >> "$version/Dockerfile"
62 
-	echo 'RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xvzC /usr/local' >> "$version/Dockerfile"
62 
+	echo 'RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local' >> "$version/Dockerfile"
63 63 
 	echo 'ENV PATH $PATH:/usr/local/go/bin' >> "$version/Dockerfile"
64 64
65 65 
 	echo >> "$version/Dockerfile"
contrib/builder/deb/ubuntu-debootstrap-trusty/Dockerfile
History View file @ 24d98c1
... ... 
@@ -7,7 +7,7 @@ FROM ubuntu-debootstrap:trusty
7 7 
 RUN apt-get update && apt-get install -y bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
8 8
9 9 
 ENV GO_VERSION 1.4.2
10 
-RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xvzC /usr/local
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
13 13 
 ENV AUTO_GOPATH 1
contrib/builder/deb/ubuntu-debootstrap-utopic/Dockerfile
History View file @ 24d98c1
... ... 
@@ -7,7 +7,7 @@ FROM ubuntu-debootstrap:utopic
7 7 
 RUN apt-get update && apt-get install -y bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
8 8
9 9 
 ENV GO_VERSION 1.4.2
10 
-RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xvzC /usr/local
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
13 13 
 ENV AUTO_GOPATH 1
contrib/builder/deb/ubuntu-debootstrap-vivid/Dockerfile
History View file @ 24d98c1
... ... 
@@ -7,7 +7,7 @@ FROM ubuntu-debootstrap:vivid
7 7 
 RUN apt-get update && apt-get install -y bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
8 8
9 9 
 ENV GO_VERSION 1.4.2
10 
-RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xvzC /usr/local
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
13 13 
 ENV AUTO_GOPATH 1
contrib/builder/rpm/centos-6/Dockerfile
History View file @ 24d98c1
... ... 
@@ -8,7 +8,7 @@ RUN yum groupinstall -y "Development Tools"
8 8 
 RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel sqlite-devel tar
9 9
10 10 
 ENV GO_VERSION 1.4.2
11 
-RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xvzC /usr/local
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
14 14 
 ENV AUTO_GOPATH 1
contrib/builder/rpm/centos-7/Dockerfile
History View file @ 24d98c1
... ... 
@@ -8,7 +8,7 @@ RUN yum groupinstall -y "Development Tools"
8 8 
 RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel sqlite-devel tar
9 9
10 10 
 ENV GO_VERSION 1.4.2
11 
-RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xvzC /usr/local
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
14 14 
 ENV AUTO_GOPATH 1
contrib/builder/rpm/fedora-20/Dockerfile
History View file @ 24d98c1
... ... 
@@ -8,7 +8,7 @@ RUN yum install -y @development-tools fedora-packager
8 8 
 RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel sqlite-devel tar
9 9
10 10 
 ENV GO_VERSION 1.4.2
11 
-RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xvzC /usr/local
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
14 14 
 ENV AUTO_GOPATH 1
contrib/builder/rpm/fedora-21/Dockerfile
History View file @ 24d98c1
... ... 
@@ -8,7 +8,7 @@ RUN yum install -y @development-tools fedora-packager
8 8 
 RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel sqlite-devel tar
9 9
10 10 
 ENV GO_VERSION 1.4.2
11 
-RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xvzC /usr/local
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
14 14 
 ENV AUTO_GOPATH 1
contrib/builder/rpm/generate.sh
History View file @ 24d98c1
... ... 
@@ -58,7 +58,7 @@ for version in "${versions[@]}"; do
58 58 
 	echo >> "$version/Dockerfile"
59 59
60 60 
 	awk '$1 == "ENV" && $2 == "GO_VERSION" { print; exit }' ../../../Dockerfile >> "$version/Dockerfile"
61 
-	echo 'RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xvzC /usr/local' >> "$version/Dockerfile"
61 
+	echo 'RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local' >> "$version/Dockerfile"
62 62 
 	echo 'ENV PATH $PATH:/usr/local/go/bin' >> "$version/Dockerfile"
63 63
64 64 
 	echo >> "$version/Dockerfile"