Merge pull request #41135 from SimenB/no-cache-alpine-image

Automatic merge from submit-queue chore (samples): Don't cache apks at all in Dockerfiles **What this PR does / why we need it**: It simplifies the sample Dockerfiles somewhat. https://github.com/gliderlabs/docker-alpine/blob/master/docs/usage.md#disabling-cache **Special notes for your reviewer**: While I'm here, any reason the Redis sample doesn't use the official Redis image from Dockerhub? **Release note**: ```release-note ```

Merge pull request #41135 from SimenB/no-cache-alpine-image
b431b2da · Kubernetes Submit Queue · GitHub · d2d84da0 · 2ac23cd4 · b431b2da
Commit b431b2da authored Mar 29, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 29, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

Dockerfile examples/storage/redis/image/Dockerfile +1 -1

Dockerfile test/images/dnsutils/Dockerfile +1 -2

No files found.
--- a/examples/storage/redis/image/Dockerfile
+++ b/examples/storage/redis/image/Dockerfile
@@ -14,7 +14,7 @@

 FROM alpine:3.4

-RUN apk add -U redis sed bash && rm -rf /var/cache/apk/*
+RUN apk add --no-cache redis sed bash

 COPY redis-master.conf /redis-master/redis.conf
 COPY redis-slave.conf /redis-slave/redis.conf

--- a/test/images/dnsutils/Dockerfile
+++ b/test/images/dnsutils/Dockerfile
@@ -14,5 +14,4 @@

 FROM alpine

-RUN apk update --no-cache
-RUN apk add bind-tools
+RUN apk add --no-cache bind-tools