From d12bbe0da9f01b3ee24cc6de48d850e580a7780e Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Wed, 6 Jan 2016 22:32:04 -0500
Subject: [PATCH] Add protobuf to the kube build image

---
 build/build-image/cross/Dockerfile | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile
index 905394a027d..c8002989117 100644
--- a/build/build-image/cross/Dockerfile
+++ b/build/build-image/cross/Dockerfile
@@ -24,3 +24,16 @@ ENV KUBE_CROSSPLATFORMS \
   windows/amd64 windows/386
 
 RUN cd /usr/src/go/src && for platform in ${KUBE_CROSSPLATFORMS}; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean; done
+
+# Download and install protoc for generating protobuf output
+RUN mkdir -p /usr/local/src/protobuf && cd /usr/local/src/protobuf &&\
+    wget -q https://github.com/google/protobuf/releases/download/v3.0.0-beta-2/protobuf-cpp-3.0.0-beta-2.tar.gz &&\
+    tar xzvf protobuf-cpp-3.0.0-beta-2.tar.gz &&\
+    cd protobuf-3.0.0-beta-2 &&\
+    ./configure &&\
+    make install &&\
+    ldconfig &&\
+    cd .. &&\
+    rm -rf protobuf-3.0.0-beta-2 &&\
+    protoc --version
+