From 1831e6f05b99a5fb62ebdbdf5a02c711a8940ed8 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 26 Sep 2018 14:42:52 -0700
Subject: [PATCH] Dockerfile, circleci: update protoc to 3.6.1

While at it, let's simplify installation

Use unzip options to unpack directly to /usr/local/{include,bin},
to avoid unnecessary I/O.

Unfortunately unzip does not support unpacking from a pipe (due
to a limitation of .zip format -- the index is at EOF) so we still
have to save the .zip to disk, read it back, and remove. If they
could only provide tarballs... *sigh*

[v2: update circleci config as well]
[v3: add chmod a+r to circleci]

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 .circleci/config.yml | 13 ++++++-------
 Dockerfile           | 18 +++++++-----------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4a8c9c620b..c0fcf6dfc7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,7 +13,7 @@ jobs:
       ARCH: amd64
       GOVERSION: 1.11
       # Needed to install protoc
-      PROTOC: https://github.com/google/protobuf/releases/download/v3.5.0/protoc-3.5.0-linux-x86_64.zip
+      PROTOC_VERSION: 3.6.1
 
     # Note(cyli): We create a tmpfs mount to be used for temporary files created by tests
     # to mitigate the excessive I/O latencies that sometimes cause the tests to fail.
@@ -61,12 +61,11 @@ jobs:
     - run:
         name: Install protoc
         command: |
-            curl -fsSL -o "$HOME/$(basename $PROTOC)" "$PROTOC"
-            unzip -o "$HOME/$(basename $PROTOC)" -d "$HOME"
-            sudo cp -R "$HOME/include/google" /usr/local/include
-            sudo chmod 777 -R /usr/local/include/google
-            sudo cp -R "$HOME/bin/protoc" /usr/local/bin
-            sudo chmod 777 /usr/local/bin/protoc
+            curl --silent --show-error --location --output protoc.zip \
+            https://github.com/google/protobuf/releases/download/v$PROTOC_VERSION/protoc-$PROTOC_VERSION-linux-x86_64.zip \
+            && sudo unzip -d /usr/local protoc.zip include/\* bin\/* \
+            && sudo chmod -R a+r /usr/local/include/google/protobuf/
+            rm -f protoc.zip
 
     - run:
         name: Install test/lint dependencies
diff --git a/Dockerfile b/Dockerfile
index 924bd00a33..fa099aa4f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,17 +3,13 @@ FROM golang:1.11.0-stretch
 
 RUN apt-get update && apt-get install -y make git unzip
 
-# should stay consistent with the version we use in Circle builds
-ARG PROTOC_VERSION=3.5.0
-# make a directory to do these operations in
-RUN export PROTOC_TMP_DIR=protoc && mkdir -p $PROTOC_TMP_DIR && cd $PROTOC_TMP_DIR \
-  # download the pre-built protoc binary
-  && curl --silent --show-error --location --output protoc.zip \
-    https://github.com/google/protobuf/releases/download/v$PROTOC_VERSION/protoc-$PROTOC_VERSION-linux-x86_64.zip \
-  # move the binary to /bin. move the well-known types ot /usr/local/include
-  && unzip protoc.zip && mv bin/protoc /bin/protoc && mv include/* /usr/local/include \
-  # remove all of the installation files
-  && cd .. && rm -rf $PROTOC_TMP_DIR
+# should stay consistent with the version in .circleci/config.yml
+ARG PROTOC_VERSION=3.6.1
+# download and install protoc binary and .proto files
+RUN curl --silent --show-error --location --output protoc.zip \
+  https://github.com/google/protobuf/releases/download/v$PROTOC_VERSION/protoc-$PROTOC_VERSION-linux-x86_64.zip \
+  && unzip -d /usr/local protoc.zip include/\* bin/\* \
+  && rm -f protoc.zip
 
 WORKDIR /go/src/github.com/docker/swarmkit/