Skip to content

Commit b66c0fa

Browse files
yosifkityosifkit
authored
Merge pull request #349 from infosiftr/docker-php-entrypoint
Add simple initial entrypoint for supporting "docker run php --flags"
2 parents cd981e5 + 76aad12 commit b66c0fa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+266
-29
lines changed

‎5.6/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,9 @@ RUN set -xe \
126126
\
127127
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
128128

129-
COPY docker-php-ext-* /usr/local/bin/
129+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
130130

131+
ENTRYPOINT ["docker-php-entrypoint"]
131132
##<autogenerated>##
132133
CMD ["php", "-a"]
133134
##</autogenerated>##

‎5.6/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,9 @@ RUN set -xe \
136136
\
137137
&& apk del .build-deps
138138

139-
COPY docker-php-ext-* /usr/local/bin/
139+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
140140

141+
ENTRYPOINT ["docker-php-entrypoint"]
141142
##<autogenerated>##
142143
CMD ["php", "-a"]
143144
##</autogenerated>##

‎5.6/alpine/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php "$@"
7+
fi
8+
9+
exec "$@"

‎5.6/apache/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,9 @@ RUN set -xe \
182182
\
183183
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
184184

185-
COPY docker-php-ext-* /usr/local/bin/
185+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
186186

187+
ENTRYPOINT ["docker-php-entrypoint"]
187188
##<autogenerated>##
188189
COPY apache2-foreground /usr/local/bin/
189190
WORKDIR /var/www/html

‎5.6/apache/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- apache2-foreground "$@"
7+
fi
8+
9+
exec "$@"

‎5.6/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php "$@"
7+
fi
8+
9+
exec "$@"

‎5.6/fpm/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ RUN set -xe \
127127
\
128128
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
129129

130-
COPY docker-php-ext-* /usr/local/bin/
130+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
131131

132+
ENTRYPOINT ["docker-php-entrypoint"]
132133
##<autogenerated>##
133134
WORKDIR /var/www/html
134135

‎5.6/fpm/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ RUN set -xe \
137137
\
138138
&& apk del .build-deps
139139

140-
COPY docker-php-ext-* /usr/local/bin/
140+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
141141

142+
ENTRYPOINT ["docker-php-entrypoint"]
142143
##<autogenerated>##
143144
WORKDIR /var/www/html
144145

‎5.6/fpm/alpine/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php-fpm "$@"
7+
fi
8+
9+
exec "$@"

‎5.6/fpm/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php-fpm "$@"
7+
fi
8+
9+
exec "$@"

‎5.6/zts/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ RUN set -xe \
127127
\
128128
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
129129

130-
COPY docker-php-ext-* /usr/local/bin/
130+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
131131

132+
ENTRYPOINT ["docker-php-entrypoint"]
132133
##<autogenerated>##
133134
CMD ["php", "-a"]
134135
##</autogenerated>##

‎5.6/zts/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ RUN set -xe \
137137
\
138138
&& apk del .build-deps
139139

140-
COPY docker-php-ext-* /usr/local/bin/
140+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
141141

142+
ENTRYPOINT ["docker-php-entrypoint"]
142143
##<autogenerated>##
143144
CMD ["php", "-a"]
144145
##</autogenerated>##

‎5.6/zts/alpine/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php "$@"
7+
fi
8+
9+
exec "$@"

‎5.6/zts/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php "$@"
7+
fi
8+
9+
exec "$@"

‎7.0/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,9 @@ RUN set -xe \
126126
\
127127
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
128128

129-
COPY docker-php-ext-* /usr/local/bin/
129+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
130130

131+
ENTRYPOINT ["docker-php-entrypoint"]
131132
##<autogenerated>##
132133
CMD ["php", "-a"]
133134
##</autogenerated>##

‎7.0/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,9 @@ RUN set -xe \
136136
\
137137
&& apk del .build-deps
138138

139-
COPY docker-php-ext-* /usr/local/bin/
139+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
140140

141+
ENTRYPOINT ["docker-php-entrypoint"]
141142
##<autogenerated>##
142143
CMD ["php", "-a"]
143144
##</autogenerated>##

‎7.0/alpine/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php "$@"
7+
fi
8+
9+
exec "$@"

‎7.0/apache/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,9 @@ RUN set -xe \
182182
\
183183
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
184184

185-
COPY docker-php-ext-* /usr/local/bin/
185+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
186186

187+
ENTRYPOINT ["docker-php-entrypoint"]
187188
##<autogenerated>##
188189
COPY apache2-foreground /usr/local/bin/
189190
WORKDIR /var/www/html

‎7.0/apache/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- apache2-foreground "$@"
7+
fi
8+
9+
exec "$@"

‎7.0/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php "$@"
7+
fi
8+
9+
exec "$@"

‎7.0/fpm/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ RUN set -xe \
127127
\
128128
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
129129

130-
COPY docker-php-ext-* /usr/local/bin/
130+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
131131

132+
ENTRYPOINT ["docker-php-entrypoint"]
132133
##<autogenerated>##
133134
WORKDIR /var/www/html
134135

‎7.0/fpm/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ RUN set -xe \
137137
\
138138
&& apk del .build-deps
139139

140-
COPY docker-php-ext-* /usr/local/bin/
140+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
141141

142+
ENTRYPOINT ["docker-php-entrypoint"]
142143
##<autogenerated>##
143144
WORKDIR /var/www/html
144145

‎7.0/fpm/alpine/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php-fpm "$@"
7+
fi
8+
9+
exec "$@"

‎7.0/fpm/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php-fpm "$@"
7+
fi
8+
9+
exec "$@"

‎7.0/zts/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ RUN set -xe \
127127
\
128128
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
129129

130-
COPY docker-php-ext-* /usr/local/bin/
130+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
131131

132+
ENTRYPOINT ["docker-php-entrypoint"]
132133
##<autogenerated>##
133134
CMD ["php", "-a"]
134135
##</autogenerated>##

‎7.0/zts/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ RUN set -xe \
137137
\
138138
&& apk del .build-deps
139139

140-
COPY docker-php-ext-* /usr/local/bin/
140+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
141141

142+
ENTRYPOINT ["docker-php-entrypoint"]
142143
##<autogenerated>##
143144
CMD ["php", "-a"]
144145
##</autogenerated>##

‎7.0/zts/alpine/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php "$@"
7+
fi
8+
9+
exec "$@"

‎7.0/zts/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php "$@"
7+
fi
8+
9+
exec "$@"

‎7.1/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,9 @@ RUN set -xe \
126126
\
127127
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
128128

129-
COPY docker-php-ext-* /usr/local/bin/
129+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
130130

131+
ENTRYPOINT ["docker-php-entrypoint"]
131132
##<autogenerated>##
132133
CMD ["php", "-a"]
133134
##</autogenerated>##

‎7.1/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,9 @@ RUN set -xe \
136136
\
137137
&& apk del .build-deps
138138

139-
COPY docker-php-ext-* /usr/local/bin/
139+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
140140

141+
ENTRYPOINT ["docker-php-entrypoint"]
141142
##<autogenerated>##
142143
CMD ["php", "-a"]
143144
##</autogenerated>##

‎7.1/alpine/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php "$@"
7+
fi
8+
9+
exec "$@"

‎7.1/apache/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,9 @@ RUN set -xe \
182182
\
183183
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
184184

185-
COPY docker-php-ext-* /usr/local/bin/
185+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
186186

187+
ENTRYPOINT ["docker-php-entrypoint"]
187188
##<autogenerated>##
188189
COPY apache2-foreground /usr/local/bin/
189190
WORKDIR /var/www/html

‎7.1/apache/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- apache2-foreground "$@"
7+
fi
8+
9+
exec "$@"

‎7.1/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php "$@"
7+
fi
8+
9+
exec "$@"

‎7.1/fpm/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ RUN set -xe \
127127
\
128128
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
129129

130-
COPY docker-php-ext-* /usr/local/bin/
130+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
131131

132+
ENTRYPOINT ["docker-php-entrypoint"]
132133
##<autogenerated>##
133134
WORKDIR /var/www/html
134135

‎7.1/fpm/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ RUN set -xe \
137137
\
138138
&& apk del .build-deps
139139

140-
COPY docker-php-ext-* /usr/local/bin/
140+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
141141

142+
ENTRYPOINT ["docker-php-entrypoint"]
142143
##<autogenerated>##
143144
WORKDIR /var/www/html
144145

‎7.1/fpm/alpine/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php-fpm "$@"
7+
fi
8+
9+
exec "$@"

‎7.1/fpm/docker-php-entrypoint

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
if [ "${1#-}" != "$1" ]; then
6+
set -- php-fpm "$@"
7+
fi
8+
9+
exec "$@"

0 commit comments

Comments
 (0)