mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 15:58:37 +00:00
Make it possible to use kube-cross as non-root
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:
parent
aade9eaabc
commit
92da8e6f1c
@ -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 \
|
||||
@ -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.
|
||||
|
@ -1 +1 @@
|
||||
v1.6.2-1
|
||||
v1.6.2-2
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user