gh-mirrors/docker-php-5.3
1
0
Fork 1
mirror of https://github.com/hrak/docker-php-5.3.git synced 2025-12-10 21:01:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clear_env does not work on PHP-5.3 unfortunately + fix some formatting issues

Browse Source
This commit is contained in:
Hans Rakers
2020-07-09 19:18:34 +02:00
parent d329b3933b
commit 243ea026a6
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Dockerfile
View File

@@ -66,9 +66,9 @@ RUN CURL_VERSION="7.71.1" \
&& gpg --verify curl.tar.gz.asc \ && gpg --verify curl.tar.gz.asc \
&& tar -xzf curl.tar.gz -C curl --strip-components=1 \ && tar -xzf curl.tar.gz -C curl --strip-components=1 \
&& cd /tmp/curl \ && cd /tmp/curl \
&& ./configure --prefix=/usr/local/curl --disable-shared --enable-static --disable-dependency-tracking \ && ./configure --prefix=/usr/local/curl --disable-shared --enable-static --disable-dependency-tracking \
--disable-symbol-hiding --enable-versioned-symbols \ --disable-symbol-hiding --enable-versioned-symbols \
--disable-threaded-resolver --with-lber-lib=lber \ --disable-threaded-resolver --with-lber-lib=lber \
--with-ssl=/usr/local/ssl \ --with-ssl=/usr/local/ssl \
--with-nghttp2 \ --with-nghttp2 \
--disable-gssapi --disable-ldap --disable-ldaps --disable-libssh2 --disable-rtsp \ --disable-gssapi --disable-ldap --disable-ldaps --disable-libssh2 --disable-rtsp \
@@ -178,7 +178,7 @@ RUN set -eux \
--with-mysql \ --with-mysql \
--with-pdo-mysql \ --with-pdo-mysql \
--with-pdo-sqlite=/usr \ --with-pdo-sqlite=/usr \
--with-sqlite3=/usr \ --with-sqlite3=/usr \
--with-libedit \ --with-libedit \
--with-zlib \ --with-zlib \
--enable-bcmath \ --enable-bcmath \
@@ -203,9 +203,9 @@ COPY docker-php-* /usr/local/bin/
# https://github.com/docker-library/php/pull/542 # https://github.com/docker-library/php/pull/542
RUN set -eux; \ RUN set -eux; \
{ \ { \
echo 'Package: php*'; \ echo 'Package: php*'; \
echo 'Pin: release *'; \ echo 'Pin: release *'; \
echo 'Pin-Priority: -1'; \ echo 'Pin-Priority: -1'; \
} > /etc/apt/preferences.d/no-debian-php } > /etc/apt/preferences.d/no-debian-php
# persistent / runtime deps and deps required for compiling extensions # persistent / runtime deps and deps required for compiling extensions
@@ -254,7 +254,7 @@ RUN set -eux; \
make clean; \ make clean; \
cp -v php.ini-* "$PHP_INI_DIR/"; \ cp -v php.ini-* "$PHP_INI_DIR/"; \
cd /; \ cd /; \
docker-php-source delete; \ docker-php-source delete; \
pecl update-channels; \ pecl update-channels; \
rm -rf /tmp/pear ~/.pearrc; \ rm -rf /tmp/pear ~/.pearrc; \
php --version php --version
@@ -287,8 +287,6 @@ RUN set -ex \
echo '; if we send this to /proc/self/fd/1, it never appears'; \ echo '; if we send this to /proc/self/fd/1, it never appears'; \
echo 'access.log = /proc/self/fd/2'; \ echo 'access.log = /proc/self/fd/2'; \
echo; \ echo; \
echo 'clear_env = no'; \
echo; \
echo '; Ensure worker stdout and stderr are sent to the main error log.'; \ echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
echo 'catch_workers_output = yes'; \ echo 'catch_workers_output = yes'; \
} | tee php-fpm.d/docker.conf \ } | tee php-fpm.d/docker.conf \