Merge pull request #304 from infosiftr/zip

tianon · web-flow · commit 9fa615dbcd71 · 2018-05-24T14:22:01.000-07:00
Add "zip" extension for new "Export Personal Data" feature
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -16,7 +16,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template
@@ -9,7 +9,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -12,7 +12,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
 	apt-mark auto '.*' > /dev/null; \
diff --git a/php5.6/apache/Dockerfile b/php5.6/apache/Dockerfile
@@ -12,7 +12,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
 	apt-mark auto '.*' > /dev/null; \
diff --git a/php5.6/cli/Dockerfile b/php5.6/cli/Dockerfile
@@ -9,7 +9,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
diff --git a/php5.6/fpm-alpine/Dockerfile b/php5.6/fpm-alpine/Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
diff --git a/php5.6/fpm/Dockerfile b/php5.6/fpm/Dockerfile
@@ -12,7 +12,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
 	apt-mark auto '.*' > /dev/null; \
diff --git a/php7.0/apache/Dockerfile b/php7.0/apache/Dockerfile
@@ -12,7 +12,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
 	apt-mark auto '.*' > /dev/null; \
diff --git a/php7.0/cli/Dockerfile b/php7.0/cli/Dockerfile
@@ -9,7 +9,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
diff --git a/php7.0/fpm-alpine/Dockerfile b/php7.0/fpm-alpine/Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
diff --git a/php7.0/fpm/Dockerfile b/php7.0/fpm/Dockerfile
@@ -12,7 +12,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
 	apt-mark auto '.*' > /dev/null; \
diff --git a/php7.1/apache/Dockerfile b/php7.1/apache/Dockerfile
@@ -12,7 +12,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
 	apt-mark auto '.*' > /dev/null; \
diff --git a/php7.1/cli/Dockerfile b/php7.1/cli/Dockerfile
@@ -9,7 +9,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
diff --git a/php7.1/fpm-alpine/Dockerfile b/php7.1/fpm-alpine/Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
diff --git a/php7.1/fpm/Dockerfile b/php7.1/fpm/Dockerfile
@@ -12,7 +12,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
 	apt-mark auto '.*' > /dev/null; \
diff --git a/php7.2/apache/Dockerfile b/php7.2/apache/Dockerfile
@@ -12,7 +12,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
 	apt-mark auto '.*' > /dev/null; \
diff --git a/php7.2/cli/Dockerfile b/php7.2/cli/Dockerfile
@@ -9,7 +9,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
diff --git a/php7.2/fpm-alpine/Dockerfile b/php7.2/fpm-alpine/Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
diff --git a/php7.2/fpm/Dockerfile b/php7.2/fpm/Dockerfile
@@ -12,7 +12,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
-	docker-php-ext-install gd mysqli opcache; \
+	docker-php-ext-install gd mysqli opcache zip; \
 	\
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
 	apt-mark auto '.*' > /dev/null; \

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ RUN set -ex; \`
`16`	`16`	`; \`
`17`	`17`	`\`
`18`	`18`	`docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \`
`19`		`- docker-php-ext-install gd mysqli opcache; \`
	`19`	`+ docker-php-ext-install gd mysqli opcache zip; \`
`20`	`20`	`\`
`21`	`21`	`runDeps="$( \`
`22`	`22`	`scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ RUN set -ex; \`
`9`	`9`	`; \`
`10`	`10`	`\`
`11`	`11`	`docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \`
`12`		`- docker-php-ext-install gd mysqli opcache; \`
	`12`	`+ docker-php-ext-install gd mysqli opcache zip; \`
`13`	`13`	`\`
`14`	`14`	`runDeps="$( \`
`15`	`15`	`scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ RUN set -ex; \`
`12`	`12`	`; \`
`13`	`13`	`\`
`14`	`14`	`docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \`
`15`		`- docker-php-ext-install gd mysqli opcache; \`
	`15`	`+ docker-php-ext-install gd mysqli opcache zip; \`
`16`	`16`	`\`
`17`	`17`	`# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies`
`18`	`18`	`apt-mark auto '.*' > /dev/null; \`