Merge pull request influxdata#1990 from influxdata/aa_protobuf_fix

testing code for compatability with protobuf 3.4.0, regenerated test files
bccblabs · Jun 29, 2018 · 202e264 · 202e264
2 parents ea9612a + 95e681f
commit 202e264
Show file tree

Hide file tree

Showing 5 changed files with 375 additions and 158 deletions.
diff --git a/Dockerfile_build_ubuntu32 b/Dockerfile_build_ubuntu32
@@ -19,7 +19,7 @@ RUN apt-get -qq update && apt-get -qq install -y \
     curl
 
 # Install protobuf3 protoc binary
-ENV PROTO_VERSION 3.0.0
+ENV PROTO_VERSION 3.4.0
 RUN wget -q https://github.com/google/protobuf/releases/download/v${PROTO_VERSION}/protoc-${PROTO_VERSION}-linux-x86_32.zip\
     && unzip -j protoc-${PROTO_VERSION}-linux-x86_32.zip bin/protoc -d /bin \
     rm protoc-${PROTO_VERSION}-linux-x86_64.zip

diff --git a/Dockerfile_build_ubuntu64 b/Dockerfile_build_ubuntu64
@@ -29,7 +29,7 @@ RUN apt-get -qq update && apt-get -qq install -y \
 RUN gem install fpm
 
 # Install protobuf3 protoc binary
-ENV PROTO_VERSION 3.0.0
+ENV PROTO_VERSION 3.4.0
 RUN wget -q https://github.com/google/protobuf/releases/download/v${PROTO_VERSION}/protoc-${PROTO_VERSION}-linux-x86_64.zip \
     && unzip -j protoc-${PROTO_VERSION}-linux-x86_64.zip bin/protoc -d /bin \
     rm protoc-${PROTO_VERSION}-linux-x86_64.zip