Merge pull request #17268 from ixdy/jenkins-test-image-apparmor

Install libapparmor1 in kubekins-test image

hack/jenkins/gotest-dockerized.sh

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

hack/jenkins/test-image/Dockerfile

@@ -24,7 +24,8 @@ ENV TERM                    xterm
 WORKDIR /workspace
 
 RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y rsync
-RUN apt-get install -y file
+# libapparmor1 is needed for docker-in-docker.
+RUN apt-get install -y file libapparmor1
 RUN mkdir -p /go/src/k8s.io/kubernetes
 RUN ln -s /go/src/k8s.io/kubernetes /workspace/kubernetes
 

hack/jenkins/test-image/Makefile

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