Skip to content

Commit 88189f0

Browse files
tianontianon
committed
Ship PHP's example "php.ini-production" and "php.ini-development" files in "$PHP_INI_DIR"
1 parent 74b59e1 commit 88189f0

File tree

61 files changed

+244
-0
lines changed

Some content is hidden

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

61 files changed

+244
-0
lines changed

‎5.6/alpine3.7/cli/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ RUN set -xe \
141141
&& make install \
142142
&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
143143
&& make clean \
144+
\
145+
# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
146+
&& cp -v php.ini-* "$PHP_INI_DIR/" \
147+
\
144148
&& cd / \
145149
&& docker-php-source delete \
146150
\

‎5.6/alpine3.7/fpm/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,10 @@ RUN set -xe \
142142
&& make install \
143143
&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
144144
&& make clean \
145+
\
146+
# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
147+
&& cp -v php.ini-* "$PHP_INI_DIR/" \
148+
\
145149
&& cd / \
146150
&& docker-php-source delete \
147151
\

‎5.6/alpine3.7/zts/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,10 @@ RUN set -xe \
142142
&& make install \
143143
&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
144144
&& make clean \
145+
\
146+
# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
147+
&& cp -v php.ini-* "$PHP_INI_DIR/" \
148+
\
145149
&& cd / \
146150
&& docker-php-source delete \
147151
\

‎5.6/alpine3.8/cli/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ RUN set -xe \
141141
&& make install \
142142
&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
143143
&& make clean \
144+
\
145+
# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
146+
&& cp -v php.ini-* "$PHP_INI_DIR/" \
147+
\
144148
&& cd / \
145149
&& docker-php-source delete \
146150
\

‎5.6/alpine3.8/fpm/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,10 @@ RUN set -xe \
142142
&& make install \
143143
&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
144144
&& make clean \
145+
\
146+
# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
147+
&& cp -v php.ini-* "$PHP_INI_DIR/" \
148+
\
145149
&& cd / \
146150
&& docker-php-source delete \
147151
\

‎5.6/alpine3.8/zts/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,10 @@ RUN set -xe \
142142
&& make install \
143143
&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
144144
&& make clean \
145+
\
146+
# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
147+
&& cp -v php.ini-* "$PHP_INI_DIR/" \
148+
\
145149
&& cd / \
146150
&& docker-php-source delete \
147151
\

‎5.6/jessie/apache/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,10 @@ RUN set -eux; \
221221
make install; \
222222
find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \
223223
make clean; \
224+
\
225+
# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
226+
cp -v php.ini-* "$PHP_INI_DIR/"; \
227+
\
224228
cd /; \
225229
docker-php-source delete; \
226230
\

‎5.6/jessie/cli/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,10 @@ RUN set -eux; \
162162
make install; \
163163
find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \
164164
make clean; \
165+
\
166+
# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
167+
cp -v php.ini-* "$PHP_INI_DIR/"; \
168+
\
165169
cd /; \
166170
docker-php-source delete; \
167171
\

‎5.6/jessie/fpm/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,10 @@ RUN set -eux; \
163163
make install; \
164164
find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \
165165
make clean; \
166+
\
167+
# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
168+
cp -v php.ini-* "$PHP_INI_DIR/"; \
169+
\
166170
cd /; \
167171
docker-php-source delete; \
168172
\

‎5.6/jessie/zts/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,10 @@ RUN set -eux; \
163163
make install; \
164164
find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; \
165165
make clean; \
166+
\
167+
# https://github.com/docker-library/php/issues/692 (copy default example "php.ini" files somewhere easily discoverable)
168+
cp -v php.ini-* "$PHP_INI_DIR/"; \
169+
\
166170
cd /; \
167171
docker-php-source delete; \
168172
\

0 commit comments

Comments
 (0)