Skip to content

Commit 551c2a8

Browse files
truestbluetruestblue
authored
Merge pull request docker-library#2 from polyverse/bugfix-magicconst
Bugfix magicconst
2 parents 7e7b694 + 0c97529 commit 551c2a8

File tree

86 files changed

+286
-296
lines changed

Some content is hidden

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

86 files changed

+286
-296
lines changed

‎.travis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ language: bash
22
services: docker
33

44
env:
5-
- VERSION=7.3-rc VARIANT=stretch/cli
6-
- VERSION=7.3-rc VARIANT=stretch/apache
7-
- VERSION=7.3-rc VARIANT=stretch/fpm
8-
- VERSION=7.3-rc VARIANT=stretch/zts
9-
- VERSION=7.3-rc VARIANT=alpine3.8/cli
10-
- VERSION=7.3-rc VARIANT=alpine3.8/fpm
11-
- VERSION=7.3-rc VARIANT=alpine3.8/zts
5+
- VERSION=7.3 VARIANT=stretch/cli
6+
- VERSION=7.3 VARIANT=stretch/apache
7+
- VERSION=7.3 VARIANT=stretch/fpm
8+
- VERSION=7.3 VARIANT=stretch/zts
9+
- VERSION=7.3 VARIANT=alpine3.8/cli
10+
- VERSION=7.3 VARIANT=alpine3.8/fpm
11+
- VERSION=7.3 VARIANT=alpine3.8/zts
1212
- VERSION=7.2 VARIANT=stretch/cli
1313
- VERSION=7.2 VARIANT=stretch/apache
1414
- VERSION=7.2 VARIANT=stretch/fpm

‎5.6/alpine3.8/cli/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
5555

5656
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
5757

58-
ENV PHP_VERSION 5.6.38
59-
ENV PHP_URL="https://secure.php.net/get/php-5.6.38.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.38.tar.xz.asc/from/this/mirror"
60-
ENV PHP_SHA256="c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e" PHP_MD5=""
58+
ENV PHP_VERSION 5.6.39
59+
ENV PHP_URL="https://secure.php.net/get/php-5.6.39.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.39.tar.xz.asc/from/this/mirror"
60+
ENV PHP_SHA256="8147576001a832ff3d03cb2980caa2d6b584a10624f87ac459fcd3948c6e4a10" PHP_MD5=""
6161

6262
RUN set -xe; \
6363
\

‎5.6/alpine3.8/fpm/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
5656

5757
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
5858

59-
ENV PHP_VERSION 5.6.38
60-
ENV PHP_URL="https://secure.php.net/get/php-5.6.38.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.38.tar.xz.asc/from/this/mirror"
61-
ENV PHP_SHA256="c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e" PHP_MD5=""
59+
ENV PHP_VERSION 5.6.39
60+
ENV PHP_URL="https://secure.php.net/get/php-5.6.39.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.39.tar.xz.asc/from/this/mirror"
61+
ENV PHP_SHA256="8147576001a832ff3d03cb2980caa2d6b584a10624f87ac459fcd3948c6e4a10" PHP_MD5=""
6262

6363
RUN set -xe; \
6464
\

‎5.6/alpine3.8/zts/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
5656

5757
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
5858

59-
ENV PHP_VERSION 5.6.38
60-
ENV PHP_URL="https://secure.php.net/get/php-5.6.38.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.38.tar.xz.asc/from/this/mirror"
61-
ENV PHP_SHA256="c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e" PHP_MD5=""
59+
ENV PHP_VERSION 5.6.39
60+
ENV PHP_URL="https://secure.php.net/get/php-5.6.39.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.39.tar.xz.asc/from/this/mirror"
61+
ENV PHP_SHA256="8147576001a832ff3d03cb2980caa2d6b584a10624f87ac459fcd3948c6e4a10" PHP_MD5=""
6262

6363
RUN set -xe; \
6464
\

‎5.6/jessie/apache/Dockerfile

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,41 +48,40 @@ RUN apt-get update \
4848
ENV APACHE_CONFDIR /etc/apache2
4949
ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
5050

51-
RUN set -ex \
51+
RUN set -eux; \
5252
\
5353
# generically convert lines like
5454
# export APACHE_RUN_USER=www-data
5555
# into
5656
# : ${APACHE_RUN_USER:=www-data}
5757
# export APACHE_RUN_USER
5858
# so that they can be overridden at runtime ("-e APACHE_RUN_USER=...")
59-
&& sed -ri 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \
59+
sed -ri 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS"; \
6060
\
6161
# setup directories and permissions
62-
&& . "$APACHE_ENVVARS" \
63-
&& for dir in \
62+
. "$APACHE_ENVVARS"; \
63+
for dir in \
6464
"$APACHE_LOCK_DIR" \
6565
"$APACHE_RUN_DIR" \
6666
"$APACHE_LOG_DIR" \
6767
/var/www/html \
6868
; do \
69-
rm -rvf "$dir" \
70-
&& mkdir -p "$dir" \
71-
&& chown -R "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir" \
69+
rm -rvf "$dir"; \
70+
mkdir -p "$dir"; \
71+
chown "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir"; \
7272
# allow running as an arbitrary user (https://github.com/docker-library/php/issues/743)
73-
&& chmod 1777 "$dir" \
74-
; done
73+
chmod 777 "$dir"; \
74+
done; \
75+
\
76+
# logs should go to stdout / stderr
77+
ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log"; \
78+
ln -sfT /dev/stdout "$APACHE_LOG_DIR/access.log"; \
79+
ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log"; \
80+
chown -R --no-dereference "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$APACHE_LOG_DIR"
7581

7682
# Apache + PHP requires preforking Apache for best results
7783
RUN a2dismod mpm_event && a2enmod mpm_prefork
7884

79-
# logs should go to stdout / stderr
80-
RUN set -ex \
81-
&& . "$APACHE_ENVVARS" \
82-
&& ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log" \
83-
&& ln -sfT /dev/stdout "$APACHE_LOG_DIR/access.log" \
84-
&& ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log"
85-
8685
# PHP files should be handled by PHP, and should be preferred over any other file type
8786
RUN { \
8887
echo '<FilesMatch \.php$>'; \
@@ -115,9 +114,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
115114

116115
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
117116

118-
ENV PHP_VERSION 5.6.38
119-
ENV PHP_URL="https://secure.php.net/get/php-5.6.38.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.38.tar.xz.asc/from/this/mirror"
120-
ENV PHP_SHA256="c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e" PHP_MD5=""
117+
ENV PHP_VERSION 5.6.39
118+
ENV PHP_URL="https://secure.php.net/get/php-5.6.39.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.39.tar.xz.asc/from/this/mirror"
119+
ENV PHP_SHA256="8147576001a832ff3d03cb2980caa2d6b584a10624f87ac459fcd3948c6e4a10" PHP_MD5=""
121120

122121
RUN set -xe; \
123122
\

‎5.6/jessie/cli/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
5454

5555
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
5656

57-
ENV PHP_VERSION 5.6.38
58-
ENV PHP_URL="https://secure.php.net/get/php-5.6.38.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.38.tar.xz.asc/from/this/mirror"
59-
ENV PHP_SHA256="c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e" PHP_MD5=""
57+
ENV PHP_VERSION 5.6.39
58+
ENV PHP_URL="https://secure.php.net/get/php-5.6.39.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.39.tar.xz.asc/from/this/mirror"
59+
ENV PHP_SHA256="8147576001a832ff3d03cb2980caa2d6b584a10624f87ac459fcd3948c6e4a10" PHP_MD5=""
6060

6161
RUN set -xe; \
6262
\

‎5.6/jessie/fpm/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
5555

5656
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
5757

58-
ENV PHP_VERSION 5.6.38
59-
ENV PHP_URL="https://secure.php.net/get/php-5.6.38.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.38.tar.xz.asc/from/this/mirror"
60-
ENV PHP_SHA256="c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e" PHP_MD5=""
58+
ENV PHP_VERSION 5.6.39
59+
ENV PHP_URL="https://secure.php.net/get/php-5.6.39.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.39.tar.xz.asc/from/this/mirror"
60+
ENV PHP_SHA256="8147576001a832ff3d03cb2980caa2d6b584a10624f87ac459fcd3948c6e4a10" PHP_MD5=""
6161

6262
RUN set -xe; \
6363
\

‎5.6/jessie/zts/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
5555

5656
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
5757

58-
ENV PHP_VERSION 5.6.38
59-
ENV PHP_URL="https://secure.php.net/get/php-5.6.38.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.38.tar.xz.asc/from/this/mirror"
60-
ENV PHP_SHA256="c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e" PHP_MD5=""
58+
ENV PHP_VERSION 5.6.39
59+
ENV PHP_URL="https://secure.php.net/get/php-5.6.39.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.39.tar.xz.asc/from/this/mirror"
60+
ENV PHP_SHA256="8147576001a832ff3d03cb2980caa2d6b584a10624f87ac459fcd3948c6e4a10" PHP_MD5=""
6161

6262
RUN set -xe; \
6363
\

‎5.6/stretch/apache/Dockerfile

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,41 +48,40 @@ RUN apt-get update \
4848
ENV APACHE_CONFDIR /etc/apache2
4949
ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
5050

51-
RUN set -ex \
51+
RUN set -eux; \
5252
\
5353
# generically convert lines like
5454
# export APACHE_RUN_USER=www-data
5555
# into
5656
# : ${APACHE_RUN_USER:=www-data}
5757
# export APACHE_RUN_USER
5858
# so that they can be overridden at runtime ("-e APACHE_RUN_USER=...")
59-
&& sed -ri 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \
59+
sed -ri 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS"; \
6060
\
6161
# setup directories and permissions
62-
&& . "$APACHE_ENVVARS" \
63-
&& for dir in \
62+
. "$APACHE_ENVVARS"; \
63+
for dir in \
6464
"$APACHE_LOCK_DIR" \
6565
"$APACHE_RUN_DIR" \
6666
"$APACHE_LOG_DIR" \
6767
/var/www/html \
6868
; do \
69-
rm -rvf "$dir" \
70-
&& mkdir -p "$dir" \
71-
&& chown -R "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir" \
69+
rm -rvf "$dir"; \
70+
mkdir -p "$dir"; \
71+
chown "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir"; \
7272
# allow running as an arbitrary user (https://github.com/docker-library/php/issues/743)
73-
&& chmod 1777 "$dir" \
74-
; done
73+
chmod 777 "$dir"; \
74+
done; \
75+
\
76+
# logs should go to stdout / stderr
77+
ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log"; \
78+
ln -sfT /dev/stdout "$APACHE_LOG_DIR/access.log"; \
79+
ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log"; \
80+
chown -R --no-dereference "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$APACHE_LOG_DIR"
7581

7682
# Apache + PHP requires preforking Apache for best results
7783
RUN a2dismod mpm_event && a2enmod mpm_prefork
7884

79-
# logs should go to stdout / stderr
80-
RUN set -ex \
81-
&& . "$APACHE_ENVVARS" \
82-
&& ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log" \
83-
&& ln -sfT /dev/stdout "$APACHE_LOG_DIR/access.log" \
84-
&& ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log"
85-
8685
# PHP files should be handled by PHP, and should be preferred over any other file type
8786
RUN { \
8887
echo '<FilesMatch \.php$>'; \
@@ -115,9 +114,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
115114

116115
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
117116

118-
ENV PHP_VERSION 5.6.38
119-
ENV PHP_URL="https://secure.php.net/get/php-5.6.38.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.38.tar.xz.asc/from/this/mirror"
120-
ENV PHP_SHA256="c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e" PHP_MD5=""
117+
ENV PHP_VERSION 5.6.39
118+
ENV PHP_URL="https://secure.php.net/get/php-5.6.39.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.39.tar.xz.asc/from/this/mirror"
119+
ENV PHP_SHA256="8147576001a832ff3d03cb2980caa2d6b584a10624f87ac459fcd3948c6e4a10" PHP_MD5=""
121120

122121
RUN set -xe; \
123122
\

‎5.6/stretch/cli/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
5454

5555
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
5656

57-
ENV PHP_VERSION 5.6.38
58-
ENV PHP_URL="https://secure.php.net/get/php-5.6.38.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.38.tar.xz.asc/from/this/mirror"
59-
ENV PHP_SHA256="c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e" PHP_MD5=""
57+
ENV PHP_VERSION 5.6.39
58+
ENV PHP_URL="https://secure.php.net/get/php-5.6.39.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.39.tar.xz.asc/from/this/mirror"
59+
ENV PHP_SHA256="8147576001a832ff3d03cb2980caa2d6b584a10624f87ac459fcd3948c6e4a10" PHP_MD5=""
6060

6161
RUN set -xe; \
6262
\

‎5.6/stretch/fpm/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
5555

5656
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
5757

58-
ENV PHP_VERSION 5.6.38
59-
ENV PHP_URL="https://secure.php.net/get/php-5.6.38.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.38.tar.xz.asc/from/this/mirror"
60-
ENV PHP_SHA256="c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e" PHP_MD5=""
58+
ENV PHP_VERSION 5.6.39
59+
ENV PHP_URL="https://secure.php.net/get/php-5.6.39.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.39.tar.xz.asc/from/this/mirror"
60+
ENV PHP_SHA256="8147576001a832ff3d03cb2980caa2d6b584a10624f87ac459fcd3948c6e4a10" PHP_MD5=""
6161

6262
RUN set -xe; \
6363
\

‎5.6/stretch/zts/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
5555

5656
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
5757

58-
ENV PHP_VERSION 5.6.38
59-
ENV PHP_URL="https://secure.php.net/get/php-5.6.38.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.38.tar.xz.asc/from/this/mirror"
60-
ENV PHP_SHA256="c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e" PHP_MD5=""
58+
ENV PHP_VERSION 5.6.39
59+
ENV PHP_URL="https://secure.php.net/get/php-5.6.39.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-5.6.39.tar.xz.asc/from/this/mirror"
60+
ENV PHP_SHA256="8147576001a832ff3d03cb2980caa2d6b584a10624f87ac459fcd3948c6e4a10" PHP_MD5=""
6161

6262
RUN set -xe; \
6363
\

‎7.0/alpine3.7/cli/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
5555

5656
ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
5757

58-
ENV PHP_VERSION 7.0.32
59-
ENV PHP_URL="https://secure.php.net/get/php-7.0.32.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.0.32.tar.xz.asc/from/this/mirror"
60-
ENV PHP_SHA256="ff6f62afeb32c71b3b89ecbd42950ef6c5e0c329cc6e1c58ffac47e6f1f883c4" PHP_MD5=""
58+
ENV PHP_VERSION 7.0.33
59+
ENV PHP_URL="https://secure.php.net/get/php-7.0.33.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.0.33.tar.xz.asc/from/this/mirror"
60+
ENV PHP_SHA256="ab8c5be6e32b1f8d032909dedaaaa4bbb1a209e519abb01a52ce3914f9a13d96" PHP_MD5=""
6161

6262
RUN set -xe; \
6363
\

‎7.0/alpine3.7/fpm/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
5656

5757
ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
5858

59-
ENV PHP_VERSION 7.0.32
60-
ENV PHP_URL="https://secure.php.net/get/php-7.0.32.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.0.32.tar.xz.asc/from/this/mirror"
61-
ENV PHP_SHA256="ff6f62afeb32c71b3b89ecbd42950ef6c5e0c329cc6e1c58ffac47e6f1f883c4" PHP_MD5=""
59+
ENV PHP_VERSION 7.0.33
60+
ENV PHP_URL="https://secure.php.net/get/php-7.0.33.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.0.33.tar.xz.asc/from/this/mirror"
61+
ENV PHP_SHA256="ab8c5be6e32b1f8d032909dedaaaa4bbb1a209e519abb01a52ce3914f9a13d96" PHP_MD5=""
6262

6363
RUN set -xe; \
6464
\

‎7.0/alpine3.7/zts/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
5656

5757
ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
5858

59-
ENV PHP_VERSION 7.0.32
60-
ENV PHP_URL="https://secure.php.net/get/php-7.0.32.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.0.32.tar.xz.asc/from/this/mirror"
61-
ENV PHP_SHA256="ff6f62afeb32c71b3b89ecbd42950ef6c5e0c329cc6e1c58ffac47e6f1f883c4" PHP_MD5=""
59+
ENV PHP_VERSION 7.0.33
60+
ENV PHP_URL="https://secure.php.net/get/php-7.0.33.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.0.33.tar.xz.asc/from/this/mirror"
61+
ENV PHP_SHA256="ab8c5be6e32b1f8d032909dedaaaa4bbb1a209e519abb01a52ce3914f9a13d96" PHP_MD5=""
6262

6363
RUN set -xe; \
6464
\

‎7.0/jessie/apache/Dockerfile

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,41 +48,40 @@ RUN apt-get update \
4848
ENV APACHE_CONFDIR /etc/apache2
4949
ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
5050

51-
RUN set -ex \
51+
RUN set -eux; \
5252
\
5353
# generically convert lines like
5454
# export APACHE_RUN_USER=www-data
5555
# into
5656
# : ${APACHE_RUN_USER:=www-data}
5757
# export APACHE_RUN_USER
5858
# so that they can be overridden at runtime ("-e APACHE_RUN_USER=...")
59-
&& sed -ri 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS" \
59+
sed -ri 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS"; \
6060
\
6161
# setup directories and permissions
62-
&& . "$APACHE_ENVVARS" \
63-
&& for dir in \
62+
. "$APACHE_ENVVARS"; \
63+
for dir in \
6464
"$APACHE_LOCK_DIR" \
6565
"$APACHE_RUN_DIR" \
6666
"$APACHE_LOG_DIR" \
6767
/var/www/html \
6868
; do \
69-
rm -rvf "$dir" \
70-
&& mkdir -p "$dir" \
71-
&& chown -R "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir" \
69+
rm -rvf "$dir"; \
70+
mkdir -p "$dir"; \
71+
chown "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir"; \
7272
# allow running as an arbitrary user (https://github.com/docker-library/php/issues/743)
73-
&& chmod 1777 "$dir" \
74-
; done
73+
chmod 777 "$dir"; \
74+
done; \
75+
\
76+
# logs should go to stdout / stderr
77+
ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log"; \
78+
ln -sfT /dev/stdout "$APACHE_LOG_DIR/access.log"; \
79+
ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log"; \
80+
chown -R --no-dereference "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$APACHE_LOG_DIR"
7581

7682
# Apache + PHP requires preforking Apache for best results
7783
RUN a2dismod mpm_event && a2enmod mpm_prefork
7884

79-
# logs should go to stdout / stderr
80-
RUN set -ex \
81-
&& . "$APACHE_ENVVARS" \
82-
&& ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log" \
83-
&& ln -sfT /dev/stdout "$APACHE_LOG_DIR/access.log" \
84-
&& ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log"
85-
8685
# PHP files should be handled by PHP, and should be preferred over any other file type
8786
RUN { \
8887
echo '<FilesMatch \.php$>'; \
@@ -115,9 +114,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
115114

116115
ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
117116

118-
ENV PHP_VERSION 7.0.32
119-
ENV PHP_URL="https://secure.php.net/get/php-7.0.32.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.0.32.tar.xz.asc/from/this/mirror"
120-
ENV PHP_SHA256="ff6f62afeb32c71b3b89ecbd42950ef6c5e0c329cc6e1c58ffac47e6f1f883c4" PHP_MD5=""
117+
ENV PHP_VERSION 7.0.33
118+
ENV PHP_URL="https://secure.php.net/get/php-7.0.33.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.0.33.tar.xz.asc/from/this/mirror"
119+
ENV PHP_SHA256="ab8c5be6e32b1f8d032909dedaaaa4bbb1a209e519abb01a52ce3914f9a13d96" PHP_MD5=""
121120

122121
RUN set -xe; \
123122
\

‎7.0/jessie/cli/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
5454

5555
ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3
5656

57-
ENV PHP_VERSION 7.0.32
58-
ENV PHP_URL="https://secure.php.net/get/php-7.0.32.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.0.32.tar.xz.asc/from/this/mirror"
59-
ENV PHP_SHA256="ff6f62afeb32c71b3b89ecbd42950ef6c5e0c329cc6e1c58ffac47e6f1f883c4" PHP_MD5=""
57+
ENV PHP_VERSION 7.0.33
58+
ENV PHP_URL="https://secure.php.net/get/php-7.0.33.tar.xz/from/this/mirror" PHP_ASC_URL="https://secure.php.net/get/php-7.0.33.tar.xz.asc/from/this/mirror"
59+
ENV PHP_SHA256="ab8c5be6e32b1f8d032909dedaaaa4bbb1a209e519abb01a52ce3914f9a13d96" PHP_MD5=""
6060

6161
RUN set -xe; \
6262
\

0 commit comments

Comments
 (0)