Skip to content

Commit 76aad12

Browse files
tianontianon
committed
Apply update.sh
1 parent 703ba52 commit 76aad12

Some content is hidden

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

42 files changed

+231
-21
lines changed

‎5.6/Dockerfile

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

126-
COPY docker-php-ext-* /usr/local/bin/
126+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
127127

128+
ENTRYPOINT ["docker-php-entrypoint"]
128129
##<autogenerated>##
129130
CMD ["php", "-a"]
130131
##</autogenerated>##

‎5.6/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,9 @@ RUN set -xe \
133133
\
134134
&& apk del .build-deps
135135

136-
COPY docker-php-ext-* /usr/local/bin/
136+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
137137

138+
ENTRYPOINT ["docker-php-entrypoint"]
138139
##<autogenerated>##
139140
CMD ["php", "-a"]
140141
##</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
@@ -179,8 +179,9 @@ RUN set -xe \
179179
\
180180
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
181181

182-
COPY docker-php-ext-* /usr/local/bin/
182+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
183183

184+
ENTRYPOINT ["docker-php-entrypoint"]
184185
##<autogenerated>##
185186
COPY apache2-foreground /usr/local/bin/
186187
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
@@ -124,8 +124,9 @@ RUN set -xe \
124124
\
125125
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
126126

127-
COPY docker-php-ext-* /usr/local/bin/
127+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
128128

129+
ENTRYPOINT ["docker-php-entrypoint"]
129130
##<autogenerated>##
130131
WORKDIR /var/www/html
131132

‎5.6/fpm/alpine/Dockerfile

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

137-
COPY docker-php-ext-* /usr/local/bin/
137+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
138138

139+
ENTRYPOINT ["docker-php-entrypoint"]
139140
##<autogenerated>##
140141
WORKDIR /var/www/html
141142

‎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
@@ -124,8 +124,9 @@ RUN set -xe \
124124
\
125125
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
126126

127-
COPY docker-php-ext-* /usr/local/bin/
127+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
128128

129+
ENTRYPOINT ["docker-php-entrypoint"]
129130
##<autogenerated>##
130131
CMD ["php", "-a"]
131132
##</autogenerated>##

‎5.6/zts/alpine/Dockerfile

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

137-
COPY docker-php-ext-* /usr/local/bin/
137+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
138138

139+
ENTRYPOINT ["docker-php-entrypoint"]
139140
##<autogenerated>##
140141
CMD ["php", "-a"]
141142
##</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
@@ -123,8 +123,9 @@ RUN set -xe \
123123
\
124124
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
125125

126-
COPY docker-php-ext-* /usr/local/bin/
126+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
127127

128+
ENTRYPOINT ["docker-php-entrypoint"]
128129
##<autogenerated>##
129130
CMD ["php", "-a"]
130131
##</autogenerated>##

‎7.0/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,9 @@ RUN set -xe \
133133
\
134134
&& apk del .build-deps
135135

136-
COPY docker-php-ext-* /usr/local/bin/
136+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
137137

138+
ENTRYPOINT ["docker-php-entrypoint"]
138139
##<autogenerated>##
139140
CMD ["php", "-a"]
140141
##</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
@@ -179,8 +179,9 @@ RUN set -xe \
179179
\
180180
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
181181

182-
COPY docker-php-ext-* /usr/local/bin/
182+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
183183

184+
ENTRYPOINT ["docker-php-entrypoint"]
184185
##<autogenerated>##
185186
COPY apache2-foreground /usr/local/bin/
186187
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
@@ -124,8 +124,9 @@ RUN set -xe \
124124
\
125125
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
126126

127-
COPY docker-php-ext-* /usr/local/bin/
127+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
128128

129+
ENTRYPOINT ["docker-php-entrypoint"]
129130
##<autogenerated>##
130131
WORKDIR /var/www/html
131132

‎7.0/fpm/alpine/Dockerfile

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

137-
COPY docker-php-ext-* /usr/local/bin/
137+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
138138

139+
ENTRYPOINT ["docker-php-entrypoint"]
139140
##<autogenerated>##
140141
WORKDIR /var/www/html
141142

‎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
@@ -124,8 +124,9 @@ RUN set -xe \
124124
\
125125
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
126126

127-
COPY docker-php-ext-* /usr/local/bin/
127+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
128128

129+
ENTRYPOINT ["docker-php-entrypoint"]
129130
##<autogenerated>##
130131
CMD ["php", "-a"]
131132
##</autogenerated>##

‎7.0/zts/alpine/Dockerfile

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

137-
COPY docker-php-ext-* /usr/local/bin/
137+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
138138

139+
ENTRYPOINT ["docker-php-entrypoint"]
139140
##<autogenerated>##
140141
CMD ["php", "-a"]
141142
##</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
@@ -123,8 +123,9 @@ RUN set -xe \
123123
\
124124
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
125125

126-
COPY docker-php-ext-* /usr/local/bin/
126+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
127127

128+
ENTRYPOINT ["docker-php-entrypoint"]
128129
##<autogenerated>##
129130
CMD ["php", "-a"]
130131
##</autogenerated>##

‎7.1/alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,9 @@ RUN set -xe \
133133
\
134134
&& apk del .build-deps
135135

136-
COPY docker-php-ext-* /usr/local/bin/
136+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
137137

138+
ENTRYPOINT ["docker-php-entrypoint"]
138139
##<autogenerated>##
139140
CMD ["php", "-a"]
140141
##</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
@@ -179,8 +179,9 @@ RUN set -xe \
179179
\
180180
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
181181

182-
COPY docker-php-ext-* /usr/local/bin/
182+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
183183

184+
ENTRYPOINT ["docker-php-entrypoint"]
184185
##<autogenerated>##
185186
COPY apache2-foreground /usr/local/bin/
186187
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
@@ -124,8 +124,9 @@ RUN set -xe \
124124
\
125125
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $buildDeps
126126

127-
COPY docker-php-ext-* /usr/local/bin/
127+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
128128

129+
ENTRYPOINT ["docker-php-entrypoint"]
129130
##<autogenerated>##
130131
WORKDIR /var/www/html
131132

‎7.1/fpm/alpine/Dockerfile

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

137-
COPY docker-php-ext-* /usr/local/bin/
137+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
138138

139+
ENTRYPOINT ["docker-php-entrypoint"]
139140
##<autogenerated>##
140141
WORKDIR /var/www/html
141142

‎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)