Skip to content

Commit

Permalink
Make it possible to use kube-cross as non-root
Browse files Browse the repository at this point in the history
The extra TMPDIR was not writable except as root.  This is not the only fix
needed for this goal, but is necessary.
  • Loading branch information
thockin committed May 10, 2016
1 parent aade9ea commit 92da8e6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion build/build-image/cross/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN for platform in ${KUBE_CROSSPLATFORMS}; do GOOS=${platform%/*} GOARCH=${plat

# Install g++, then download and install protoc for generating protobuf output
RUN apt-get update \
&& apt-get install -y g++ rsync \
&& apt-get install -y g++ rsync apt-utils file \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

RUN mkdir -p /usr/local/src/protobuf \
Expand Down Expand Up @@ -64,6 +64,8 @@ ENV TMPDIR /tmp.k8s

# Get the code coverage tool and godep
RUN mkdir $TMPDIR \
&& chmod a+rwx $TMPDIR \
&& chmod o+t $TMPDIR \
&& go get golang.org/x/tools/cmd/cover github.com/tools/godep

# Download and symlink etcd. We need this for our integration tests.
Expand Down
2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.6.2-1
v1.6.2-2
2 changes: 1 addition & 1 deletion build/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ readonly KUBE_GCS_DELETE_EXISTING="${KUBE_GCS_DELETE_EXISTING:-n}"

# Constants
readonly KUBE_BUILD_IMAGE_REPO=kube-build
readonly KUBE_BUILD_IMAGE_CROSS_TAG="v1.6.2-1"
readonly KUBE_BUILD_IMAGE_CROSS_TAG="v1.6.2-2"
# KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-<hash>"

# Here we map the output directories across both the local and remote _output
Expand Down
2 changes: 1 addition & 1 deletion cluster/images/flannel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
TAG?=0.5.5
ARCH?=amd64
REGISTRY?=gcr.io/google_containers
KUBE_CROSS_TAG=v1.6.2-1
KUBE_CROSS_TAG=$(shell cat ../../../build-image/cross/VERSION)
GOARM=6
TEMP_DIR:=$(shell mktemp -d)
BASEIMAGE?=gcr.io/google_containers/debian-iptables-${ARCH}:v2
Expand Down

0 comments on commit 92da8e6

Please sign in to comment.