Upgrade to protobuf 3.0.0 (influxdata#821)

* upgrade to protobuf 3.0.0

* changelog

CHANGELOG.md

@@ -50,6 +50,7 @@ The corresponding alert states are:
 - [#772](https://github.com/influxdata/kapacitor/issues/772): Delete task snapshot data when a task is deleted.
 - [#797](https://github.com/influxdata/kapacitor/issues/797): Fix panic from race condition in task master.
 - [#811](https://github.com/influxdata/kapacitor/pull/811): Fix bug where subscriptions + tokens would not work with more than one InfluxDB cluster.
+- [#812](https://github.com/influxdata/kapacitor/issues/812): Upgrade to use protobuf version 3.0.0
 
 ## v1.0.0-beta4 [2016-07-27]
 

Dockerfile_build_ubuntu32

@@ -7,6 +7,7 @@ MAINTAINER [email protected]
 
 RUN apt-get update && apt-get install -y \
     wget \
+    unzip \
     git \
     mercurial \
     build-essential \
@@ -17,14 +18,22 @@ RUN apt-get update && apt-get install -y \
     zip \
     curl
 
-# Install protobuf3
-ADD install-deps.sh /tmp/
-RUN INSTALL_PREFIX=/usr /tmp/install-deps.sh
-RUN rm /tmp/install-deps.sh
+# Install protobuf3 protoc binary
+ENV PROTO_VERSION 3.0.0
+RUN wget 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
+
+# Install protobuf3 python library
+RUN wget https://github.com/google/protobuf/releases/download/v${PROTO_VERSION}/protobuf-python-${PROTO_VERSION}.tar.gz \
+    && tar -xf protobuf-python-${PROTO_VERSION}.tar.gz \
+    && cd /protobuf-${PROTO_VERSION}/python \
+    && python setup.py install \
+    && rm -rf /protobuf-${PROTO_VERSION} protobuf-python-${PROTO_VERSION}.tar.gz
 
 # Install go
 ENV GOPATH /root/go
-ENV GO_VERSION 1.6.2
+ENV GO_VERSION 1.6.3
 ENV GO_ARCH 386
 RUN wget https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \
    tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ; \

Dockerfile_build_ubuntu64

@@ -9,6 +9,7 @@ RUN apt-get update && apt-get install -y \
     python-software-properties \
     software-properties-common \
     wget \
+    unzip \
     git \
     mercurial \
     make \
@@ -27,14 +28,22 @@ RUN apt-get update && apt-get install -y \
 
 RUN gem install fpm
 
-# Install protobuf3
-ADD install-deps.sh /tmp/
-RUN INSTALL_PREFIX=/usr /tmp/install-deps.sh
-RUN rm /tmp/install-deps.sh
+# Install protobuf3 protoc binary
+ENV PROTO_VERSION 3.0.0
+RUN wget 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
+
+# Install protobuf3 python library
+RUN wget https://github.com/google/protobuf/releases/download/v${PROTO_VERSION}/protobuf-python-${PROTO_VERSION}.tar.gz \
+    && tar -xf protobuf-python-${PROTO_VERSION}.tar.gz \
+    && cd /protobuf-${PROTO_VERSION}/python \
+    && python setup.py install \
+    && rm -rf /protobuf-${PROTO_VERSION} protobuf-python-${PROTO_VERSION}.tar.gz
 
 # Install go
 ENV GOPATH /root/go
-ENV GO_VERSION 1.6.2
+ENV GO_VERSION 1.6.3
 ENV GO_ARCH amd64
 RUN wget https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \
    tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ; \

Dockerfile_build_ubuntu64_git

@@ -7,6 +7,7 @@ MAINTAINER [email protected]
 
 RUN apt-get update && apt-get install -y \
     wget \
+    unzip \
     git \
     mercurial \
     build-essential \
@@ -17,10 +18,18 @@ RUN apt-get update && apt-get install -y \
     zip \
     curl
 
-# Install protobuf3
-ADD install-deps.sh /tmp/
-RUN INSTALL_PREFIX=/usr /tmp/install-deps.sh
-RUN rm /tmp/install-deps.sh
+# Install protobuf3 protoc binary
+ENV PROTO_VERSION 3.0.0
+RUN wget 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
+
+# Install protobuf3 python library
+RUN wget https://github.com/google/protobuf/releases/download/v${PROTO_VERSION}/protobuf-python-${PROTO_VERSION}.tar.gz \
+    && tar -xf protobuf-python-${PROTO_VERSION}.tar.gz \
+    && cd /protobuf-${PROTO_VERSION}/python \
+    && python setup.py install \
+    && rm -rf /protobuf-${PROTO_VERSION} protobuf-python-${PROTO_VERSION}.tar.gz
 
 # Setup env
 ENV GOPATH /root/go

circle-test.sh

@@ -13,6 +13,7 @@ cd $DIR
 export OUTPUT_DIR="$CIRCLE_ARTIFACTS"
 # Don't delete the container since CircleCI doesn't have permission to do so.
 export DOCKER_RM="false"
+export NO_UNCOMMITTED=true
 
 # Get number of test environments.
 count=$(./test.sh count)

test.sh

@@ -28,6 +28,15 @@ DOCKER_SAVE_DIR=${DOCKER_SAVE_DIR-$HOME/docker}
 PARALLELISM=${PARALLELISM-1}
 # Set default timeout
 TIMEOUT=${TIMEOUT-480s}
+# No uncommitted changes
+NO_UNCOMMITTED=${NO_UNCOMMITTED-false}
+
+no_uncomitted_arg="$no_uncommitted_arg"
+if [ ! $NO_UNCOMMITTED ]
+then
+    no_uncomitted_arg=""
+fi
+
 
 # Default to deleteing the container
 DOCKER_RM=${DOCKER_RM-true}
@@ -131,24 +140,24 @@ fi
 case $ENVIRONMENT_INDEX in
     0)
         # 64 bit tests
-        run_test_docker Dockerfile_build_ubuntu64 test_64bit --debug --test --generate --no-uncommitted
+        run_test_docker Dockerfile_build_ubuntu64 test_64bit --debug --test --generate $no_uncommitted_arg
         rc=$?
         ;;
     1)
         # 64 bit race tests
         GORACE="halt_on_error=1"
-        run_test_docker Dockerfile_build_ubuntu64 test_64bit_race --debug --test --generate --no-uncommitted --race
+        run_test_docker Dockerfile_build_ubuntu64 test_64bit_race --debug --test --generate $no_uncommitted_arg --race
         rc=$?
         ;;
     2)
         # 32 bit tests
-        run_test_docker Dockerfile_build_ubuntu32 test_32bit --debug --test --generate --no-uncommitted --arch=i386
+        run_test_docker Dockerfile_build_ubuntu32 test_32bit --debug --test --generate $no_uncommitted_arg --arch=i386
         rc=$?
         ;;
     3)
         # 64 bit tests on golang go1.6
         GO_CHECKOUT=go1.6rc2
-        run_test_docker Dockerfile_build_ubuntu64_git test_64bit_go1.6 --debug --test --generate --no-uncommitted
+        run_test_docker Dockerfile_build_ubuntu64_git test_64bit_go1.6 --debug --test --generate $no_uncommitted_arg
         rc=$?
         ;;
     "save")