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

Update kubekins-test image to include netcat

Browse Source
This commit is contained in:
Jeff Grafton 2016-01-19 15:08:39 -08:00
parent 62bc09adf3
commit ad8ea35d94
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/jenkins/gotest-dockerized.sh
View File

@ -42,5 +42,5 @@ docker run --rm=true \
-v "${REPO_DIR}":/go/src/k8s.io/kubernetes \ -v "${REPO_DIR}":/go/src/k8s.io/kubernetes \
-v "${KUBE_JUNIT_REPORT_DIR}":/workspace/artifacts \ -v "${KUBE_JUNIT_REPORT_DIR}":/workspace/artifacts \
--env REPO_DIR="${REPO_DIR}" \ --env REPO_DIR="${REPO_DIR}" \
-i gcr.io/google_containers/kubekins-test:0.5 \ -i gcr.io/google_containers/kubekins-test:0.6 \
bash -c "cd kubernetes && ./hack/jenkins/test-dockerized.sh" bash -c "cd kubernetes && ./hack/jenkins/test-dockerized.sh"

6
hack/jenkins/test-image/Dockerfile
View File

@ -24,8 +24,12 @@ ENV TERM xterm
WORKDIR /workspace WORKDIR /workspace
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y rsync RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y rsync
# file is used when uploading test artifacts to GCS.
RUN apt-get install -y file
# libapparmor1 is needed for docker-in-docker. # libapparmor1 is needed for docker-in-docker.
RUN apt-get install -y file libapparmor1 RUN apt-get install -y libapparmor1
# netcat is used by integration test scripts.
RUN apt-get install -y netcat-openbsd
RUN mkdir -p /go/src/k8s.io/kubernetes RUN mkdir -p /go/src/k8s.io/kubernetes
RUN ln -s /go/src/k8s.io/kubernetes /workspace/kubernetes RUN ln -s /go/src/k8s.io/kubernetes /workspace/kubernetes

2
hack/jenkins/test-image/Makefile
View File

@ -1,6 +1,6 @@
all: push all: push
TAG = 0.5 TAG = 0.6
container: container:
docker build -t gcr.io/google_containers/kubekins-test . docker build -t gcr.io/google_containers/kubekins-test .