github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-03 23:40:03 +00:00
Code Issues Projects Releases Wiki Activity

Add jq and remove godep from kube-cross

Browse Source
This commit is contained in:
Christoph Blecker
2017-05-23 22:37:34 -07:00
parent 499d6da965
commit e89ab20ceb
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ RUN for platform in ${KUBE_CROSSPLATFORMS}; do GOOS=${platform%/*} GOARCH=${plat
# Install g++, then download and install protoc for generating protobuf output # Install g++, then download and install protoc for generating protobuf output
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y g++ rsync apt-utils file patch \ && apt-get install -y g++ rsync jq apt-utils file patch \
&& apt-get clean && rm -rf /var/lib/apt/lists/* && apt-get clean && rm -rf /var/lib/apt/lists/*
RUN mkdir -p /usr/local/src/protobuf \ RUN mkdir -p /usr/local/src/protobuf \
@@ -62,14 +62,13 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu xenial main universe" > /etc/apt/
# work around 64MB tmpfs size in Docker 1.6 # work around 64MB tmpfs size in Docker 1.6
ENV TMPDIR /tmp.k8s ENV TMPDIR /tmp.k8s
# Get the code coverage tool, goimports, and godep
RUN mkdir $TMPDIR \ RUN mkdir $TMPDIR \
&& chmod a+rwx $TMPDIR \ && chmod a+rwx $TMPDIR \
&& chmod o+t $TMPDIR \ && chmod o+t $TMPDIR
&& go get golang.org/x/tools/cmd/cover \
golang.org/x/tools/cmd/goimports \ # Get the code coverage tool and goimports
github.com/tools/godep RUN go get golang.org/x/tools/cmd/cover \
golang.org/x/tools/cmd/goimports
# Download and symlink etcd. We need this for our integration tests. # Download and symlink etcd. We need this for our integration tests.
RUN export ETCD_VERSION=v3.0.17; \ RUN export ETCD_VERSION=v3.0.17; \

2
build/build-image/cross/VERSION
View File

@@ -1 +1 @@
v1.8.3-1 v1.8.3-2