From 896d04d5f32b7427551fa60b1a8cbd69f93045a0 Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Fri, 13 Nov 2015 17:11:54 -0800
Subject: [PATCH] Install libapparmor1 in kubekins-test image

---
 hack/jenkins/gotest-dockerized.sh  | 2 +-
 hack/jenkins/test-image/Dockerfile | 3 ++-
 hack/jenkins/test-image/Makefile   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hack/jenkins/gotest-dockerized.sh b/hack/jenkins/gotest-dockerized.sh
index 2443533a402..f451c533ed8 100755
--- a/hack/jenkins/gotest-dockerized.sh
+++ b/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"
diff --git a/hack/jenkins/test-image/Dockerfile b/hack/jenkins/test-image/Dockerfile
index 17f624a8985..f7160d1ef14 100644
--- a/hack/jenkins/test-image/Dockerfile
+++ b/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
 
diff --git a/hack/jenkins/test-image/Makefile b/hack/jenkins/test-image/Makefile
index c2caacf935d..ea6d9d50865 100644
--- a/hack/jenkins/test-image/Makefile
+++ b/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 .