Merge pull request #27901 from jfrazelle/clean-hack-dockerfiles

hack/gen-swagger-doc/Dockerfile

@@ -14,27 +14,32 @@
 
 FROM java:7-jre
 
-RUN apt-get update
-RUN apt-get install -qq -y asciidoctor
-RUN apt-get install -qq -y unzip
-RUN wget https://services.gradle.org/distributions/gradle-2.5-bin.zip
-RUN mkdir build/
-RUN unzip gradle-2.5-bin.zip -d build/
-
-RUN mkdir gradle-cache/
+RUN apt-get update && apt-get install -y \
+	asciidoctor \
+	unzip \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/*
+
+# Install gradle
+RUN wget -O /tmp/gradle.zip https://services.gradle.org/distributions/gradle-2.5-bin.zip \
+	&& mkdir -p build/ \
+	&& unzip /tmp/gradle.zip -d build/ \
+	&& rm /tmp/gradle.zip \
+	&& mkdir -p gradle-cache/
+
 ENV GRADLE_USER_HOME=/gradle-cache
 
 COPY build.gradle build/
 COPY gen-swagger-docs.sh build/
 
-#run the script once to download the dependent java libraries into the image
-RUN mkdir /output /swagger-source
-RUN wget https://raw.githubusercontent.com/kubernetes/kubernetes/master/api/swagger-spec/v1.json -O /swagger-source/v1.json
-RUN wget https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/pkg/api/v1/register.go -O /register.go
-RUN build/gen-swagger-docs.sh v1
-RUN rm /output/* /swagger-source/* /register.go
+# Run the script once to download the dependent java libraries into the image
+RUN mkdir -p /output /swagger-source \
+	&& wget https://raw.githubusercontent.com/kubernetes/kubernetes/master/api/swagger-spec/v1.json -O /swagger-source/v1.json \
+	&& wget https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/pkg/api/v1/register.go -O /register.go \
+	&& build/gen-swagger-docs.sh v1 \
+	&& rm -rf /output/* /swagger-source/* /register.go
 
-RUN chmod -R 777 build/
-RUN chmod -R 777 gradle-cache/
+RUN chmod -R 777 build/ \
+	&& chmod -R 777 gradle-cache/
 
 ENTRYPOINT ["build/gen-swagger-docs.sh"]

hack/jenkins/dockerized-e2e-runner.sh

@@ -61,5 +61,5 @@ docker run --rm=true -i \
   -e "WORKSPACE=/workspace" \
   "${docker_extra_args[@]:+${docker_extra_args[@]}}" \
   "${METADATA_SERVER_ADD_HOST_ARGS[@]:+${METADATA_SERVER_ADD_HOST_ARGS[@]}}" \
-  gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev2 \
+  gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev3 \
   bash -c "bash <(curl -fsS --retry 3 --keepalive-time 2 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')"

hack/jenkins/gotest-dockerized.sh

@@ -44,5 +44,5 @@ docker run --rm=true \
   -e "KUBE_VERIFY_GIT_BRANCH=${KUBE_VERIFY_GIT_BRANCH:-}" \
   -e "REPO_DIR=${REPO_DIR}" \
   -e "HOST_ARTIFACTS_DIR=${HOST_ARTIFACTS_DIR}" \
-  -i gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev2 \
+  -i gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev3 \
   bash -c "cd kubernetes && ${KUBE_TEST_SCRIPT:-./hack/jenkins/test-dockerized.sh}"

hack/jenkins/test-image/Dockerfile

@@ -28,22 +28,23 @@ WORKDIR /workspace
 
 # dnsutils is needed by federation cluster scripts.
 # file is used when uploading test artifacts to GCS.
-# jq is used by hack/verify-godep-licenses.sh.
+# jq is used by hack/verify-godep-licenses.sh
 # python-pip is needed to install the AWS cli.
 # netcat is used by integration test scripts.
-RUN apt-get update && apt-get install -y \
-  dnsutils \
-  file \
-  jq \
-  python-pip \
-  netcat-openbsd \
-  rsync \
-  && rm -rf /var/lib/apt/lists/*
+RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y \
+	dnsutils \
+	file \
+	jq \
+	python-pip \
+	netcat-openbsd \
+	rsync \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/*
 
 RUN curl -L "https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz" |\
   tar -C /usr/bin -xvzf- --strip-components=3 usr/local/bin/docker
 
-RUN mkdir -p /go/src/k8s.io/kubernetes
-RUN ln -s /go/src/k8s.io/kubernetes /workspace/kubernetes
+RUN mkdir -p /go/src/k8s.io/kubernetes \
+	&& ln -s /go/src/k8s.io/kubernetes /workspace/kubernetes
 
 RUN /bin/bash

hack/jenkins/test-image/Makefile

@@ -16,7 +16,7 @@ all: push
 
 # Tag format: $GO_VERSION-$EMBEDDED_DOCKER_VERSION-$REVISION
 # These versions are specified in the Dockerfile
-TAG = go1.6.2-docker1.9.1-rev2
+TAG = go1.6.2-docker1.9.1-rev3
 
 container:
 	docker build -t gcr.io/google_containers/kubekins-test .

hack/update-api-reference-docs.sh

@@ -72,7 +72,7 @@ for ver in $VERSIONS; do
     -v "${SWAGGER_PATH}":/swagger-source:z \
     -v "${REGISTER_FILE}":/register.go:z \
     --net=host -e "https_proxy=${KUBERNETES_HTTPS_PROXY:-}" \
-    gcr.io/google_containers/gen-swagger-docs:v6 \
+    gcr.io/google_containers/gen-swagger-docs:v7 \
     "${SWAGGER_JSON_NAME}"
 done