github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19359 from smarterclayton/add_proto_to_build_image

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-15 07:56:23 -08:00
commit f3793d0942
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/build-image/cross/Dockerfile
View File

@ -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