Apply update.sh

tianon · tianon · commit 76aad12fde39 · 2016-12-15T10:44:01.000-08:00
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -123,8 +123,9 @@ RUN set -xe \
 	\
 	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
 ##</autogenerated>##
diff --git a/5.6/alpine/Dockerfile b/5.6/alpine/Dockerfile
@@ -133,8 +133,9 @@ RUN set -xe \
 	\
 	&& apk del .build-deps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
 ##</autogenerated>##
diff --git a/5.6/alpine/docker-php-entrypoint b/5.6/alpine/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile
@@ -179,8 +179,9 @@ RUN set -xe \
 	\
 	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 COPY apache2-foreground /usr/local/bin/
 WORKDIR /var/www/html
diff --git a/5.6/apache/docker-php-entrypoint b/5.6/apache/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/5.6/docker-php-entrypoint b/5.6/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile
@@ -124,8 +124,9 @@ RUN set -xe \
 	\
 	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 WORKDIR /var/www/html
 
diff --git a/5.6/fpm/alpine/Dockerfile b/5.6/fpm/alpine/Dockerfile
@@ -134,8 +134,9 @@ RUN set -xe \
 	\
 	&& apk del .build-deps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 WORKDIR /var/www/html
 
diff --git a/5.6/fpm/alpine/docker-php-entrypoint b/5.6/fpm/alpine/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php-fpm "$@"
+fi
+
+exec "$@"
diff --git a/5.6/fpm/docker-php-entrypoint b/5.6/fpm/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php-fpm "$@"
+fi
+
+exec "$@"
diff --git a/5.6/zts/Dockerfile b/5.6/zts/Dockerfile
@@ -124,8 +124,9 @@ RUN set -xe \
 	\
 	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
 ##</autogenerated>##
diff --git a/5.6/zts/alpine/Dockerfile b/5.6/zts/alpine/Dockerfile
@@ -134,8 +134,9 @@ RUN set -xe \
 	\
 	&& apk del .build-deps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
 ##</autogenerated>##
diff --git a/5.6/zts/alpine/docker-php-entrypoint b/5.6/zts/alpine/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/5.6/zts/docker-php-entrypoint b/5.6/zts/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/7.0/Dockerfile b/7.0/Dockerfile
@@ -123,8 +123,9 @@ RUN set -xe \
 	\
 	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
 ##</autogenerated>##
diff --git a/7.0/alpine/Dockerfile b/7.0/alpine/Dockerfile
@@ -133,8 +133,9 @@ RUN set -xe \
 	\
 	&& apk del .build-deps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
 ##</autogenerated>##
diff --git a/7.0/alpine/docker-php-entrypoint b/7.0/alpine/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile
@@ -179,8 +179,9 @@ RUN set -xe \
 	\
 	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 COPY apache2-foreground /usr/local/bin/
 WORKDIR /var/www/html
diff --git a/7.0/apache/docker-php-entrypoint b/7.0/apache/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/7.0/docker-php-entrypoint b/7.0/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile
@@ -124,8 +124,9 @@ RUN set -xe \
 	\
 	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 WORKDIR /var/www/html
 
diff --git a/7.0/fpm/alpine/Dockerfile b/7.0/fpm/alpine/Dockerfile
@@ -134,8 +134,9 @@ RUN set -xe \
 	\
 	&& apk del .build-deps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 WORKDIR /var/www/html
 
diff --git a/7.0/fpm/alpine/docker-php-entrypoint b/7.0/fpm/alpine/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php-fpm "$@"
+fi
+
+exec "$@"
diff --git a/7.0/fpm/docker-php-entrypoint b/7.0/fpm/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php-fpm "$@"
+fi
+
+exec "$@"
diff --git a/7.0/zts/Dockerfile b/7.0/zts/Dockerfile
@@ -124,8 +124,9 @@ RUN set -xe \
 	\
 	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
 ##</autogenerated>##
diff --git a/7.0/zts/alpine/Dockerfile b/7.0/zts/alpine/Dockerfile
@@ -134,8 +134,9 @@ RUN set -xe \
 	\
 	&& apk del .build-deps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
 ##</autogenerated>##
diff --git a/7.0/zts/alpine/docker-php-entrypoint b/7.0/zts/alpine/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/7.0/zts/docker-php-entrypoint b/7.0/zts/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/7.1/Dockerfile b/7.1/Dockerfile
@@ -123,8 +123,9 @@ RUN set -xe \
 	\
 	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
 ##</autogenerated>##
diff --git a/7.1/alpine/Dockerfile b/7.1/alpine/Dockerfile
@@ -133,8 +133,9 @@ RUN set -xe \
 	\
 	&& apk del .build-deps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 CMD ["php", "-a"]
 ##</autogenerated>##
diff --git a/7.1/alpine/docker-php-entrypoint b/7.1/alpine/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/7.1/apache/Dockerfile b/7.1/apache/Dockerfile
@@ -179,8 +179,9 @@ RUN set -xe \
 	\
 	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 COPY apache2-foreground /usr/local/bin/
 WORKDIR /var/www/html
diff --git a/7.1/apache/docker-php-entrypoint b/7.1/apache/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- apache2-foreground "$@"
+fi
+
+exec "$@"
diff --git a/7.1/docker-php-entrypoint b/7.1/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/7.1/fpm/Dockerfile b/7.1/fpm/Dockerfile
@@ -124,8 +124,9 @@ RUN set -xe \
 	\
 	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 WORKDIR /var/www/html
 
diff --git a/7.1/fpm/alpine/Dockerfile b/7.1/fpm/alpine/Dockerfile
@@ -134,8 +134,9 @@ RUN set -xe \
 	\
 	&& apk del .build-deps
 
-COPY docker-php-ext-* /usr/local/bin/
+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
 
+ENTRYPOINT ["docker-php-entrypoint"]
 ##<autogenerated>##
 WORKDIR /var/www/html
 
diff --git a/7.1/fpm/alpine/docker-php-entrypoint b/7.1/fpm/alpine/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php-fpm "$@"
+fi
+
+exec "$@"
diff --git a/7.1/fpm/docker-php-entrypoint b/7.1/fpm/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php-fpm "$@"
+fi
+
+exec "$@"
diff --git a/7.1/zts/Dockerfile b/7.1/zts/Dockerfile
diff --git a/7.1/zts/alpine/Dockerfile b/7.1/zts/alpine/Dockerfile
diff --git a/7.1/zts/alpine/docker-php-entrypoint b/7.1/zts/alpine/docker-php-entrypoint
diff --git a/7.1/zts/docker-php-entrypoint b/7.1/zts/docker-php-entrypoint

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,9 @@ RUN set -xe \`
`123`	`123`	`\`
`124`	`124`	`&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps`
`125`	`125`
`126`		`-COPY docker-php-ext-* /usr/local/bin/`
	`126`	`+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/`
`127`	`127`
	`128`	`+ENTRYPOINT ["docker-php-entrypoint"]`
`128`	`129`	`##<autogenerated>##`
`129`	`130`	`CMD ["php", "-a"]`
`130`	`131`	`##</autogenerated>##`
Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,9 @@ RUN set -xe \`
`133`	`133`	`\`
`134`	`134`	`&& apk del .build-deps`
`135`	`135`
`136`		`-COPY docker-php-ext-* /usr/local/bin/`
	`136`	`+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/`
`137`	`137`
	`138`	`+ENTRYPOINT ["docker-php-entrypoint"]`
`138`	`139`	`##<autogenerated>##`
`139`	`140`	`CMD ["php", "-a"]`
`140`	`141`	`##</autogenerated>##`
Original file line number	Diff line number	Diff line change
`@@ -179,8 +179,9 @@ RUN set -xe \`
`179`	`179`	`\`
`180`	`180`	`&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps`
`181`	`181`
`182`		`-COPY docker-php-ext-* /usr/local/bin/`
	`182`	`+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/`
`183`	`183`
	`184`	`+ENTRYPOINT ["docker-php-entrypoint"]`
`184`	`185`	`##<autogenerated>##`
`185`	`186`	`COPY apache2-foreground /usr/local/bin/`
`186`	`187`	`WORKDIR /var/www/html`
Original file line number	Diff line number	Diff line change
`@@ -124,8 +124,9 @@ RUN set -xe \`
`124`	`124`	`\`
`125`	`125`	`&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps`
`126`	`126`
`127`		`-COPY docker-php-ext-* /usr/local/bin/`
	`127`	`+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/`
`128`	`128`
	`129`	`+ENTRYPOINT ["docker-php-entrypoint"]`
`129`	`130`	`##<autogenerated>##`
`130`	`131`	`WORKDIR /var/www/html`
`131`	`132`
Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,9 @@ RUN set -xe \`
`134`	`134`	`\`
`135`	`135`	`&& apk del .build-deps`
`136`	`136`
`137`		`-COPY docker-php-ext-* /usr/local/bin/`
	`137`	`+COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/`
`138`	`138`
	`139`	`+ENTRYPOINT ["docker-php-entrypoint"]`
`139`	`140`	`##<autogenerated>##`
`140`	`141`	`WORKDIR /var/www/html`
`141`	`142`