Merge pull request #349 from infosiftr/docker-php-entrypoint

yosifkit · web-flow · commit b66c0fa0286d · 2016-12-15T16:12:25.000-08:00
Add simple initial entrypoint for supporting "docker run php --flags"
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -126,8 +126,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
@@ -136,8 +136,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
@@ -182,8 +182,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
@@ -127,8 +127,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
@@ -137,8 +137,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
@@ -127,8 +127,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
@@ -137,8 +137,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
@@ -126,8 +126,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
@@ -136,8 +136,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
@@ -182,8 +182,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
@@ -127,8 +127,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
@@ -137,8 +137,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
@@ -127,8 +127,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
@@ -137,8 +137,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
@@ -126,8 +126,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
@@ -136,8 +136,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
@@ -182,8 +182,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
@@ -127,8 +127,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
@@ -137,8 +137,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
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
diff --git a/docker-php-entrypoint b/docker-php-entrypoint
diff --git a/update.sh b/update.sh

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