github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Make it possible to use kube-cross as non-root

Browse Source 
The extra TMPDIR was not writable except as root.  This is not the only fix
needed for this goal, but is necessary.
This commit is contained in:
Tim Hockin 2016-05-09 23:26:42 -07:00
parent aade9eaabc
commit 92da8e6f1c
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 # 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-get install -y g++ rsync apt-utils file \
&& 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 \
@ -64,6 +64,8 @@ ENV TMPDIR /tmp.k8s
# Get the code coverage tool and godep # Get the code coverage tool and godep
RUN mkdir $TMPDIR \ RUN mkdir $TMPDIR \
&& chmod a+rwx $TMPDIR \
&& chmod o+t $TMPDIR \
&& go get golang.org/x/tools/cmd/cover github.com/tools/godep && go get golang.org/x/tools/cmd/cover github.com/tools/godep
# Download and symlink etcd. We need this for our integration tests. # Download and symlink etcd. We need this for our integration tests.

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

@ -1 +1 @@
v1.6.2-1 v1.6.2-2

2
build/common.sh
View File

@ -45,7 +45,7 @@ readonly KUBE_GCS_DELETE_EXISTING="${KUBE_GCS_DELETE_EXISTING:-n}"
# Constants # Constants
readonly KUBE_BUILD_IMAGE_REPO=kube-build 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>" # KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-<hash>"
# Here we map the output directories across both the local and remote _output # Here we map the output directories across both the local and remote _output

2
cluster/images/flannel/Makefile
View File

@ -20,7 +20,7 @@
TAG?=0.5.5 TAG?=0.5.5
ARCH?=amd64 ARCH?=amd64
REGISTRY?=gcr.io/google_containers REGISTRY?=gcr.io/google_containers
KUBE_CROSS_TAG=v1.6.2-1 KUBE_CROSS_TAG=$(shell cat ../../../build-image/cross/VERSION)
GOARM=6 GOARM=6
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
BASEIMAGE?=gcr.io/google_containers/debian-iptables-${ARCH}:v2 BASEIMAGE?=gcr.io/google_containers/debian-iptables-${ARCH}:v2