Merge pull request #330 from nvllsvm/alpinecache

yosifkit · web-flow · commit f4e3623114d1 · 2018-08-17T10:42:46.000-07:00
Add --no-cache for all apk commands
diff --git a/2.7/alpine3.6/Dockerfile b/2.7/alpine3.6/Dockerfile
@@ -79,7 +79,7 @@ RUN set -ex \
 		| tr ',' '\n' \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-		| xargs -rt apk add --virtual .python-rundeps \
+		| xargs -rt apk add --no-cache --virtual .python-rundeps \
 	&& apk del .build-deps \
 	\
 	&& find /usr/local -depth \
diff --git a/2.7/alpine3.7/Dockerfile b/2.7/alpine3.7/Dockerfile
@@ -79,7 +79,7 @@ RUN set -ex \
 		| tr ',' '\n' \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-		| xargs -rt apk add --virtual .python-rundeps \
+		| xargs -rt apk add --no-cache --virtual .python-rundeps \
 	&& apk del .build-deps \
 	\
 	&& find /usr/local -depth \
diff --git a/2.7/alpine3.8/Dockerfile b/2.7/alpine3.8/Dockerfile
@@ -79,7 +79,7 @@ RUN set -ex \
 		| tr ',' '\n' \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-		| xargs -rt apk add --virtual .python-rundeps \
+		| xargs -rt apk add --no-cache --virtual .python-rundeps \
 	&& apk del .build-deps \
 	\
 	&& find /usr/local -depth \
diff --git a/3.4/alpine3.7/Dockerfile b/3.4/alpine3.7/Dockerfile
@@ -81,7 +81,7 @@ RUN set -ex \
 		| tr ',' '\n' \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-		| xargs -rt apk add --virtual .python-rundeps \
+		| xargs -rt apk add --no-cache --virtual .python-rundeps \
 	&& apk del .build-deps \
 	\
 	&& find /usr/local -depth \
diff --git a/3.4/alpine3.8/Dockerfile b/3.4/alpine3.8/Dockerfile
@@ -81,7 +81,7 @@ RUN set -ex \
 		| tr ',' '\n' \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-		| xargs -rt apk add --virtual .python-rundeps \
+		| xargs -rt apk add --no-cache --virtual .python-rundeps \
 	&& apk del .build-deps \
 	\
 	&& find /usr/local -depth \
diff --git a/3.5/alpine3.7/Dockerfile b/3.5/alpine3.7/Dockerfile
@@ -81,7 +81,7 @@ RUN set -ex \
 		| tr ',' '\n' \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-		| xargs -rt apk add --virtual .python-rundeps \
+		| xargs -rt apk add --no-cache --virtual .python-rundeps \
 	&& apk del .build-deps \
 	\
 	&& find /usr/local -depth \
diff --git a/3.5/alpine3.8/Dockerfile b/3.5/alpine3.8/Dockerfile
@@ -81,7 +81,7 @@ RUN set -ex \
 		| tr ',' '\n' \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-		| xargs -rt apk add --virtual .python-rundeps \
+		| xargs -rt apk add --no-cache --virtual .python-rundeps \
 	&& apk del .build-deps \
 	\
 	&& find /usr/local -depth \
diff --git a/3.6/alpine3.6/Dockerfile b/3.6/alpine3.6/Dockerfile
@@ -83,7 +83,7 @@ RUN set -ex \
 		| tr ',' '\n' \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-		| xargs -rt apk add --virtual .python-rundeps \
+		| xargs -rt apk add --no-cache --virtual .python-rundeps \
 	&& apk del .build-deps \
 	\
 	&& find /usr/local -depth \
diff --git a/3.6/alpine3.7/Dockerfile b/3.6/alpine3.7/Dockerfile
@@ -83,7 +83,7 @@ RUN set -ex \
 		| tr ',' '\n' \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-		| xargs -rt apk add --virtual .python-rundeps \
+		| xargs -rt apk add --no-cache --virtual .python-rundeps \
 	&& apk del .build-deps \
 	\
 	&& find /usr/local -depth \
diff --git a/3.6/alpine3.8/Dockerfile b/3.6/alpine3.8/Dockerfile
@@ -83,7 +83,7 @@ RUN set -ex \
 		| tr ',' '\n' \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-		| xargs -rt apk add --virtual .python-rundeps \
+		| xargs -rt apk add --no-cache --virtual .python-rundeps \
 	&& apk del .build-deps \
 	\
 	&& find /usr/local -depth \
diff --git a/3.7/alpine3.7/Dockerfile b/3.7/alpine3.7/Dockerfile
@@ -84,7 +84,7 @@ RUN set -ex \
 		| tr ',' '\n' \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-		| xargs -rt apk add --virtual .python-rundeps \
+		| xargs -rt apk add --no-cache --virtual .python-rundeps \
 	&& apk del .build-deps \
 	\
 	&& find /usr/local -depth \
diff --git a/3.7/alpine3.8/Dockerfile b/3.7/alpine3.8/Dockerfile
@@ -84,7 +84,7 @@ RUN set -ex \
 		| tr ',' '\n' \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-		| xargs -rt apk add --virtual .python-rundeps \
+		| xargs -rt apk add --no-cache --virtual .python-rundeps \
 	&& apk del .build-deps \
 	\
 	&& find /usr/local -depth \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -80,7 +80,7 @@ RUN set -ex \
 		| tr ',' '\n' \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-		| xargs -rt apk add --virtual .python-rundeps \
+		| xargs -rt apk add --no-cache --virtual .python-rundeps \
 	&& apk del .build-deps \
 	\
 	&& find /usr/local -depth \
diff --git a/Dockerfile-caveman-alpine.template b/Dockerfile-caveman-alpine.template
@@ -75,7 +75,7 @@ RUN set -ex \
 		| tr ',' '\n' \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-		| xargs -rt apk add --virtual .python-rundeps \
+		| xargs -rt apk add --no-cache --virtual .python-rundeps \
 	&& apk del .build-deps \
 	\
 	&& find /usr/local -depth \

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ RUN set -ex \`
`79`	`79`	`\| tr ',' '\n' \`
`80`	`80`	`\| sort -u \`
`81`	`81`	`\| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \`
`82`		`- \| xargs -rt apk add --virtual .python-rundeps \`
	`82`	`+ \| xargs -rt apk add --no-cache --virtual .python-rundeps \`
`83`	`83`	`&& apk del .build-deps \`
`84`	`84`	`\`
`85`	`85`	`&& find /usr/local -depth \`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ RUN set -ex \`
`81`	`81`	`\| tr ',' '\n' \`
`82`	`82`	`\| sort -u \`
`83`	`83`	`\| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \`
`84`		`- \| xargs -rt apk add --virtual .python-rundeps \`
	`84`	`+ \| xargs -rt apk add --no-cache --virtual .python-rundeps \`
`85`	`85`	`&& apk del .build-deps \`
`86`	`86`	`\`
`87`	`87`	`&& find /usr/local -depth \`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ RUN set -ex \`
`83`	`83`	`\| tr ',' '\n' \`
`84`	`84`	`\| sort -u \`
`85`	`85`	`\| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \`
`86`		`- \| xargs -rt apk add --virtual .python-rundeps \`
	`86`	`+ \| xargs -rt apk add --no-cache --virtual .python-rundeps \`
`87`	`87`	`&& apk del .build-deps \`
`88`	`88`	`\`
`89`	`89`	`&& find /usr/local -depth \`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ RUN set -ex \`
`84`	`84`	`\| tr ',' '\n' \`
`85`	`85`	`\| sort -u \`
`86`	`86`	`\| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \`
`87`		`- \| xargs -rt apk add --virtual .python-rundeps \`
	`87`	`+ \| xargs -rt apk add --no-cache --virtual .python-rundeps \`
`88`	`88`	`&& apk del .build-deps \`
`89`	`89`	`\`
`90`	`90`	`&& find /usr/local -depth \`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ RUN set -ex \`
`80`	`80`	`\| tr ',' '\n' \`
`81`	`81`	`\| sort -u \`
`82`	`82`	`\| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \`
`83`		`- \| xargs -rt apk add --virtual .python-rundeps \`
	`83`	`+ \| xargs -rt apk add --no-cache --virtual .python-rundeps \`
`84`	`84`	`&& apk del .build-deps \`
`85`	`85`	`\`
`86`	`86`	`&& find /usr/local -depth \`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ RUN set -ex \`
`75`	`75`	`\| tr ',' '\n' \`
`76`	`76`	`\| sort -u \`
`77`	`77`	`\| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \`
`78`		`- \| xargs -rt apk add --virtual .python-rundeps \`
	`78`	`+ \| xargs -rt apk add --no-cache --virtual .python-rundeps \`
`79`	`79`	`&& apk del .build-deps \`
`80`	`80`	`\`
`81`	`81`	`&& find /usr/local -depth \`