Skip to content

Commit 7838783

Browse files
tianontianon
committed
Update to 5.6.40
1 parent 0f18979 commit 7838783

Some content is hidden

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

71 files changed

+6262
-3
lines changed

‎.travis.yml

+11
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,17 @@ env:
2727
- VERSION=7.1 VARIANT=alpine3.8/cli
2828
- VERSION=7.1 VARIANT=alpine3.8/fpm
2929
- VERSION=7.1 VARIANT=alpine3.8/zts
30+
- VERSION=5.6 VARIANT=stretch/cli
31+
- VERSION=5.6 VARIANT=stretch/apache
32+
- VERSION=5.6 VARIANT=stretch/fpm
33+
- VERSION=5.6 VARIANT=stretch/zts
34+
- VERSION=5.6 VARIANT=jessie/cli
35+
- VERSION=5.6 VARIANT=jessie/apache
36+
- VERSION=5.6 VARIANT=jessie/fpm
37+
- VERSION=5.6 VARIANT=jessie/zts
38+
- VERSION=5.6 VARIANT=alpine3.8/cli
39+
- VERSION=5.6 VARIANT=alpine3.8/fpm
40+
- VERSION=5.6 VARIANT=alpine3.8/zts
3041

3142
install:
3243
- git clone https://github.com/docker-library/official-images.git ~/official-images

‎5.6/alpine3.8/cli/Dockerfile

+170
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
3+
#
4+
# PLEASE DO NOT EDIT IT DIRECTLY.
5+
#
6+
7+
FROM alpine:3.8
8+
9+
# dependencies required for running "phpize"
10+
# these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed)
11+
ENV PHPIZE_DEPS \
12+
autoconf \
13+
dpkg-dev dpkg \
14+
file \
15+
g++ \
16+
gcc \
17+
libc-dev \
18+
make \
19+
pkgconf \
20+
re2c
21+
22+
# persistent / runtime deps
23+
RUN apk add --no-cache --virtual .persistent-deps \
24+
ca-certificates \
25+
curl \
26+
tar \
27+
xz \
28+
# https://github.com/docker-library/php/issues/494
29+
libressl
30+
31+
# ensure www-data user exists
32+
RUN set -x \
33+
&& addgroup -g 82 -S www-data \
34+
&& adduser -u 82 -D -S -G www-data www-data
35+
# 82 is the standard uid/gid for "www-data" in Alpine
36+
# http://git.alpinelinux.org/cgit/aports/tree/main/apache2/apache2.pre-install?h=v3.3.2
37+
# http://git.alpinelinux.org/cgit/aports/tree/main/lighttpd/lighttpd.pre-install?h=v3.3.2
38+
# http://git.alpinelinux.org/cgit/aports/tree/main/nginx-initscripts/nginx-initscripts.pre-install?h=v3.3.2
39+
40+
ENV PHP_INI_DIR /usr/local/etc/php
41+
RUN mkdir -p $PHP_INI_DIR/conf.d
42+
43+
##<autogenerated>##
44+
##</autogenerated>##
45+
46+
# Apply stack smash protection to functions using local buffers and alloca()
47+
# Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
48+
# Enable optimization (-O2)
49+
# Enable linker optimization (this sorts the hash buckets to improve cache locality, and is non-default)
50+
# Adds GNU HASH segments to generated executables (this is used if present, and is much faster than sysv hash; in this configuration, sysv hash is also generated)
51+
# https://github.com/docker-library/php/issues/272
52+
ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
53+
ENV PHP_CPPFLAGS="$PHP_CFLAGS"
54+
ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
55+
56+
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
57+
58+
ENV PHP_VERSION 5.6.40
59+
ENV PHP_URL="https://secure.php.net/get/php-5.6.40.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.40.tar.xz.asc/from/this/mirror"
60+
ENV PHP_SHA256="1369a51eee3995d7fbd1c5342e5cc917760e276d561595b6052b21ace2656d1c" PHP_MD5=""
61+
62+
RUN set -xe; \
63+
\
64+
apk add --no-cache --virtual .fetch-deps \
65+
gnupg \
66+
wget \
67+
; \
68+
\
69+
mkdir -p /usr/src; \
70+
cd /usr/src; \
71+
\
72+
wget -O php.tar.xz "$PHP_URL"; \
73+
\
74+
if [ -n "$PHP_SHA256" ]; then \
75+
echo "$PHP_SHA256 *php.tar.xz" | sha256sum -c -; \
76+
fi; \
77+
if [ -n "$PHP_MD5" ]; then \
78+
echo "$PHP_MD5 *php.tar.xz" | md5sum -c -; \
79+
fi; \
80+
\
81+
if [ -n "$PHP_ASC_URL" ]; then \
82+
wget -O php.tar.xz.asc "$PHP_ASC_URL"; \
83+
export GNUPGHOME="$(mktemp -d)"; \
84+
for key in $GPG_KEYS; do \
85+
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
86+
done; \
87+
gpg --batch --verify php.tar.xz.asc php.tar.xz; \
88+
command -v gpgconf > /dev/null && gpgconf --kill all; \
89+
rm -rf "$GNUPGHOME"; \
90+
fi; \
91+
\
92+
apk del .fetch-deps
93+
94+
COPY docker-php-source /usr/local/bin/
95+
96+
RUN set -xe \
97+
&& apk add --no-cache --virtual .build-deps \
98+
$PHPIZE_DEPS \
99+
coreutils \
100+
curl-dev \
101+
libedit-dev \
102+
libressl-dev \
103+
libxml2-dev \
104+
sqlite-dev \
105+
\
106+
&& export CFLAGS="$PHP_CFLAGS" \
107+
CPPFLAGS="$PHP_CPPFLAGS" \
108+
LDFLAGS="$PHP_LDFLAGS" \
109+
&& docker-php-source extract \
110+
&& cd /usr/src/php \
111+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
112+
&& ./configure \
113+
--build="$gnuArch" \
114+
--with-config-file-path="$PHP_INI_DIR" \
115+
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
116+
\
117+
# make sure invalid --configure-flags are fatal errors intead of just warnings
118+
--enable-option-checking=fatal \
119+
\
120+
# https://github.com/docker-library/php/issues/439
121+
--with-mhash \
122+
\
123+
# --enable-ftp is included here because ftp_ssl_connect() needs ftp to be compiled statically (see https://github.com/docker-library/php/issues/236)
124+
--enable-ftp \
125+
# --enable-mbstring is included here because otherwise there's no way to get pecl to use it properly (see https://github.com/docker-library/php/issues/195)
126+
--enable-mbstring \
127+
# --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself)
128+
--enable-mysqlnd \
129+
\
130+
--with-curl \
131+
--with-libedit \
132+
--with-openssl \
133+
--with-zlib \
134+
\
135+
# bundled pcre does not support JIT on s390x
136+
# https://manpages.debian.org/stretch/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
137+
$(test "$gnuArch" = 's390x-linux-gnu' && echo '--without-pcre-jit') \
138+
\
139+
$PHP_EXTRA_CONFIGURE_ARGS \
140+
&& make -j "$(nproc)" \
141+
&& make install \
142+
&& { find /usr/local/bin /usr/local/sbin -type f -perm +0111 -exec strip --strip-all '{}' + || true; } \
143+
&& 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+
\
148+
&& cd / \
149+
&& docker-php-source delete \
150+
\
151+
&& runDeps="$( \
152+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
153+
| tr ',' '\n' \
154+
| sort -u \
155+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
156+
)" \
157+
&& apk add --no-cache --virtual .php-rundeps $runDeps \
158+
\
159+
&& apk del .build-deps \
160+
\
161+
# https://github.com/docker-library/php/issues/443
162+
&& pecl update-channels \
163+
&& rm -rf /tmp/pear ~/.pearrc
164+
165+
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
166+
167+
ENTRYPOINT ["docker-php-entrypoint"]
168+
##<autogenerated>##
169+
CMD ["php", "-a"]
170+
##</autogenerated>##

‎5.6/alpine3.8/cli/docker-php-entrypoint

+9
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/alpine3.8/cli/docker-php-ext-configure

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# prefer user supplied CFLAGS, but default to our PHP_CFLAGS
5+
: ${CFLAGS:=$PHP_CFLAGS}
6+
: ${CPPFLAGS:=$PHP_CPPFLAGS}
7+
: ${LDFLAGS:=$PHP_LDFLAGS}
8+
export CFLAGS CPPFLAGS LDFLAGS
9+
10+
srcExists=
11+
if [ -d /usr/src/php ]; then
12+
srcExists=1
13+
fi
14+
docker-php-source extract
15+
if [ -z "$srcExists" ]; then
16+
touch /usr/src/php/.docker-delete-me
17+
fi
18+
19+
cd /usr/src/php/ext
20+
21+
usage() {
22+
echo "usage: $0 ext-name [configure flags]"
23+
echo " ie: $0 gd --with-jpeg-dir=/usr/local/something"
24+
echo
25+
echo 'Possible values for ext-name:'
26+
find . \
27+
-mindepth 2 \
28+
-maxdepth 2 \
29+
-type f \
30+
-name 'config.m4' \
31+
| xargs -n1 dirname \
32+
| xargs -n1 basename \
33+
| sort \
34+
| xargs
35+
echo
36+
echo 'Some of the above modules are already compiled into PHP; please check'
37+
echo 'the output of "php -i" to see which modules are already loaded.'
38+
}
39+
40+
ext="$1"
41+
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
42+
usage >&2
43+
exit 1
44+
fi
45+
shift
46+
47+
pm='unknown'
48+
if [ -e /lib/apk/db/installed ]; then
49+
pm='apk'
50+
fi
51+
52+
if [ "$pm" = 'apk' ]; then
53+
if \
54+
[ -n "$PHPIZE_DEPS" ] \
55+
&& ! apk info --installed .phpize-deps > /dev/null \
56+
&& ! apk info --installed .phpize-deps-configure > /dev/null \
57+
; then
58+
apk add --no-cache --virtual .phpize-deps-configure $PHPIZE_DEPS
59+
fi
60+
fi
61+
62+
if command -v dpkg-architecture > /dev/null; then
63+
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"
64+
set -- --build="$gnuArch" "$@"
65+
fi
66+
67+
cd "$ext"
68+
phpize
69+
./configure "$@"

‎5.6/alpine3.8/cli/docker-php-ext-enable

+114
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
#!/bin/sh
2+
set -e
3+
4+
extDir="$(php -r 'echo ini_get("extension_dir");')"
5+
cd "$extDir"
6+
7+
usage() {
8+
echo "usage: $0 [options] module-name [module-name ...]"
9+
echo " ie: $0 gd mysqli"
10+
echo " $0 pdo pdo_mysql"
11+
echo " $0 --ini-name 0-apc.ini apcu apc"
12+
echo
13+
echo 'Possible values for module-name:'
14+
find -maxdepth 1 \
15+
-type f \
16+
-name '*.so' \
17+
-exec basename '{}' ';' \
18+
| sort \
19+
| xargs
20+
echo
21+
echo 'Some of the above modules are already compiled into PHP; please check'
22+
echo 'the output of "php -i" to see which modules are already loaded.'
23+
}
24+
25+
opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"
26+
eval set -- "$opts"
27+
28+
iniName=
29+
while true; do
30+
flag="$1"
31+
shift
32+
case "$flag" in
33+
--help|-h|'-?') usage && exit 0 ;;
34+
--ini-name) iniName="$1" && shift ;;
35+
--) break ;;
36+
*)
37+
{
38+
echo "error: unknown flag: $flag"
39+
usage
40+
} >&2
41+
exit 1
42+
;;
43+
esac
44+
done
45+
46+
modules=
47+
for module; do
48+
if [ -z "$module" ]; then
49+
continue
50+
fi
51+
if [ -f "$module.so" ] && ! [ -f "$module" ]; then
52+
# allow ".so" to be optional
53+
module="$module.so"
54+
fi
55+
if ! [ -f "$module" ]; then
56+
echo >&2 "error: '$module' does not exist"
57+
echo >&2
58+
usage >&2
59+
exit 1
60+
fi
61+
modules="$modules $module"
62+
done
63+
64+
if [ -z "$modules" ]; then
65+
usage >&2
66+
exit 1
67+
fi
68+
69+
pm='unknown'
70+
if [ -e /lib/apk/db/installed ]; then
71+
pm='apk'
72+
fi
73+
74+
apkDel=
75+
if [ "$pm" = 'apk' ]; then
76+
if \
77+
[ -n "$PHPIZE_DEPS" ] \
78+
&& ! apk info --installed .phpize-deps > /dev/null \
79+
&& ! apk info --installed .phpize-deps-configure > /dev/null \
80+
; then
81+
apk add --no-cache --virtual '.docker-php-ext-enable-deps' binutils
82+
apkDel='.docker-php-ext-enable-deps'
83+
fi
84+
fi
85+
86+
for module in $modules; do
87+
if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
88+
# https://wiki.php.net/internals/extensions#loading_zend_extensions
89+
absModule="$(readlink -f "$module")"
90+
line="zend_extension=$absModule"
91+
else
92+
line="extension=$module"
93+
fi
94+
95+
ext="$(basename "$module")"
96+
ext="${ext%.*}"
97+
if php -r 'exit(extension_loaded("'"$ext"'") ? 0 : 1);'; then
98+
# this isn't perfect, but it's better than nothing
99+
# (for example, 'opcache.so' presents inside PHP as 'Zend OPcache', not 'opcache')
100+
echo >&2
101+
echo >&2 "warning: $ext ($module) is already loaded!"
102+
echo >&2
103+
continue
104+
fi
105+
106+
ini="$PHP_INI_DIR/conf.d/${iniName:-"docker-php-ext-$ext.ini"}"
107+
if ! grep -q "$line" "$ini" 2>/dev/null; then
108+
echo "$line" >> "$ini"
109+
fi
110+
done
111+
112+
if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then
113+
apk del $apkDel
114+
fi

0 commit comments

Comments
 (0)