Skip to content

Commit c26093b

Browse files
author
Bryan Latten
committed
Base: updated to 8.8
1 parent d348f0c commit c26093b

File tree

6 files changed

+166
-62
lines changed

6 files changed

+166
-62
lines changed

‎Dockerfile-7.0‎

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM behance/docker-nginx:8.7
1+
FROM behance/docker-nginx:8.8
22
LABEL maintainers="Behance Team <[email protected]>"
33

44
# Set TERM to suppress warning messages.
@@ -23,6 +23,7 @@ ENV CONF_PHPFPM=/etc/php/7.0/fpm/php-fpm.conf \
2323
PHP_OPCACHE_MEMORY_CONSUMPTION=128 \
2424
PHP_OPCACHE_INTERNED_STRINGS_BUFFER=16 \
2525
PHP_OPCACHE_MAX_WASTED_PERCENTAGE=5 \
26+
PHP_ENGINE_VERSION=20151012 \
2627
CFG_APP_DEBUG=1
2728

2829
# - Update security packages, only
@@ -56,6 +57,11 @@ COPY container/root/usr/local/bin/pecl-install /usr/local/bin
5657
RUN apt-get update -q && \
5758
# Ensure PHP 5.5 + 5.6 + 7.1 don't accidentally get added by PPA
5859
apt-mark hold \
60+
manpages \
61+
manpages-dev \
62+
apache2 \
63+
apache2-bin \
64+
libapache2-mod-php7.0 \
5965
php5.6-cli \
6066
php5.6-common \
6167
php5.6-json \
@@ -80,15 +86,12 @@ RUN apt-get update -q && \
8086
php7.0-curl \
8187
php7.0-fpm \
8288
php7.0-gd \
83-
php7.0-igbinary \
8489
php7.0-intl \
8590
php7.0-json \
8691
php7.0-mbstring \
8792
php7.0-mcrypt \
8893
php7.0-memcache \
89-
php7.0-memcached \
9094
php7.0-pgsql \
91-
php7.0-redis \
9295
php7.0-xdebug \
9396
php7.0-xml \
9497
php7.0-yaml \
@@ -98,21 +101,40 @@ RUN apt-get update -q && \
98101
newrelic-daemon \
99102
# Order of operations issue is preventing this from being installed in alphabetical order
100103
php7.0-mysql \
104+
# below required to compile non-packaged extensions
105+
php7.0-dev \
106+
pkg-config \
107+
libmemcached-dev \
108+
pkg-config \
109+
zlib1g-dev \
101110
&& \
111+
pecl-install \
112+
igbinary \
113+
memcached \
114+
msgpack \
115+
redis \
116+
&& \
117+
apt-get remove --purge -yq \
118+
php7.0-dev \
119+
pkg-config \
120+
build-essential \
121+
cpp \
122+
cpp-7 \
123+
gcc \
124+
&& \
125+
/bin/bash /clean.sh \
126+
&& \
127+
phpenmod memcached && \
102128
phpdismod pdo_pgsql && \
103129
phpdismod pgsql && \
104130
phpdismod redis && \
105131
phpdismod yaml && \
106132
phpdismod xdebug && \
107133
# Remove extra extensions installed via packages for other versions of PHP, leaving the active engine folder
108-
rm -rf /usr/lib/php/20121212 && \
109-
rm -rf /usr/lib/php/20131226 && \
110-
rm -rf /usr/lib/php/20160303 && \
111-
rm -rf /usr/lib/php/20170718 && \
112-
rm -rf /usr/lib/php/20180731 && \
113-
rm -rf /usr/lib/php/20190902 && \
134+
cd /usr/lib/php && \
135+
ls -d */ | grep '[0-9]\{8\}' | grep -v ${PHP_ENGINE_VERSION} | xargs rm -rf && \
114136
# Remove unused agents for other PHP versions
115-
cd /usr/lib/newrelic-php5/agent/x64 && ls | grep -v newrelic-20151012.so | xargs rm && \
137+
cd /usr/lib/newrelic-php5/agent/x64 && ls | grep -v newrelic-${PHP_ENGINE_VERSION}.so | xargs rm && \
116138
cd / && \
117139
curl -sS https://getcomposer.org/installer | php && \
118140
mv composer.phar /usr/local/bin/composer && \

‎Dockerfile-7.1‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM behance/docker-nginx:8.7
1+
FROM behance/docker-nginx:8.8
22
LABEL maintainers="Behance Team <[email protected]>"
33

44
# Set TERM to suppress warning messages.
@@ -23,6 +23,7 @@ ENV CONF_PHPFPM=/etc/php/7.1/fpm/php-fpm.conf \
2323
PHP_OPCACHE_MEMORY_CONSUMPTION=128 \
2424
PHP_OPCACHE_INTERNED_STRINGS_BUFFER=16 \
2525
PHP_OPCACHE_MAX_WASTED_PERCENTAGE=5 \
26+
PHP_ENGINE_VERSION=20160303 \
2627
CFG_APP_DEBUG=1
2728

2829
# - Update security packages, only
@@ -56,6 +57,11 @@ COPY container/root/usr/local/bin/pecl-install /usr/local/bin
5657
RUN apt-get update -q && \
5758
# Ensure PHP 5.5 + 5.6 + 7.0 don't accidentally get added by PPA
5859
apt-mark hold \
60+
manpages \
61+
manpages-dev \
62+
apache2 \
63+
apache2-bin \
64+
libapache2-mod-php7.1 \
5965
php5.6-cli \
6066
php5.6-common \
6167
php5.6-json \
@@ -80,17 +86,13 @@ RUN apt-get update -q && \
8086
php7.1-curl \
8187
php7.1-fpm \
8288
php7.1-gd \
83-
php7.1-igbinary \
8489
php7.1-intl \
8590
php7.1-json \
8691
php7.1-mbstring \
8792
php7.1-memcache \
88-
php7.1-memcached \
89-
php7.1-msgpack \
9093
php7.1-mcrypt \
9194
php7.1-mysql \
9295
php7.1-pgsql \
93-
php7.1-redis \
9496
php7.1-xdebug \
9597
php7.1-xml \
9698
php7.1-yaml \
@@ -99,21 +101,40 @@ RUN apt-get update -q && \
99101
newrelic-php5 \
100102
newrelic-php5-common \
101103
newrelic-daemon \
104+
# below required to compile non-packaged extensions
105+
php7.1-dev \
106+
pkg-config \
107+
libmemcached-dev \
108+
pkg-config \
109+
zlib1g-dev \
102110
&& \
111+
pecl-install \
112+
igbinary \
113+
memcached \
114+
msgpack \
115+
redis \
116+
&& \
117+
apt-get remove --purge -yq \
118+
php7.1-dev \
119+
pkg-config \
120+
build-essential \
121+
cpp \
122+
cpp-7 \
123+
gcc \
124+
&& \
125+
/bin/bash /clean.sh \
126+
&& \
127+
phpenmod memcached && \
103128
phpdismod pdo_pgsql && \
104129
phpdismod pgsql && \
105130
phpdismod redis && \
106131
phpdismod yaml && \
107132
phpdismod xdebug && \
108133
# Remove extra extensions installed via packages for other versions of PHP, leaving the active engine folder
109-
rm -rf /usr/lib/php/20121212 && \
110-
rm -rf /usr/lib/php/20131226 && \
111-
rm -rf /usr/lib/php/20151012 && \
112-
rm -rf /usr/lib/php/20170718 && \
113-
rm -rf /usr/lib/php/20180731 && \
114-
rm -rf /usr/lib/php/20190902 && \
134+
cd /usr/lib/php && \
135+
ls -d */ | grep '[0-9]\{8\}' | grep -v ${PHP_ENGINE_VERSION} | xargs rm -rf && \
115136
# Remove unused agents for other PHP versions
116-
cd /usr/lib/newrelic-php5/agent/x64 && ls | grep -v newrelic-20160303.so | xargs rm && \
137+
cd /usr/lib/newrelic-php5/agent/x64 && ls | grep -v newrelic-${PHP_ENGINE_VERSION}.so | xargs rm && \
117138
cd / && \
118139
curl -sS https://getcomposer.org/installer | php && \
119140
mv composer.phar /usr/local/bin/composer && \

‎Dockerfile-7.2‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM behance/docker-nginx:8.7
1+
FROM behance/docker-nginx:8.8
22
LABEL maintainers="Behance Team <[email protected]>"
33

44
# Set TERM to suppress warning messages.
@@ -23,6 +23,7 @@ ENV CONF_PHPFPM=/etc/php/7.2/fpm/php-fpm.conf \
2323
PHP_OPCACHE_MEMORY_CONSUMPTION=128 \
2424
PHP_OPCACHE_INTERNED_STRINGS_BUFFER=16 \
2525
PHP_OPCACHE_MAX_WASTED_PERCENTAGE=5 \
26+
PHP_ENGINE_VERSION=20170718 \
2627
CFG_APP_DEBUG=1
2728

2829
# - Update security packages, only
@@ -56,6 +57,11 @@ COPY container/root/usr/local/bin/pecl-install /usr/local/bin
5657
RUN apt-get update -q && \
5758
# Ensure PHP 5.5 + 5.6 + 7.1 don't accidentally get added by PPA
5859
apt-mark hold \
60+
manpages \
61+
manpages-dev \
62+
apache2 \
63+
apache2-bin \
64+
libapache2-mod-php7.2 \
5965
php5.6-cli \
6066
php5.6-common \
6167
php5.6-json \
@@ -80,38 +86,53 @@ RUN apt-get update -q && \
8086
php7.2-curl \
8187
php7.2-fpm \
8288
php7.2-gd \
83-
php7.2-igbinary \
8489
php7.2-intl \
8590
php7.2-json \
8691
php7.2-mbstring \
8792
php7.2-memcache \
88-
php7.2-memcached \
89-
php7.2-msgpack \
9093
php7.2-mysql \
9194
php7.2-pgsql \
92-
php7.2-redis \
9395
php7.2-xdebug \
9496
php7.2-xml \
9597
php7.2-yaml \
9698
php7.2-zip \
9799
newrelic-php5 \
98100
newrelic-php5-common \
99101
newrelic-daemon \
102+
# below required to compile non-packaged extensions
103+
php7.2-dev \
104+
pkg-config \
105+
libmemcached-dev \
106+
pkg-config \
107+
zlib1g-dev \
100108
&& \
109+
pecl-install \
110+
igbinary \
111+
memcached \
112+
msgpack \
113+
redis \
114+
&& \
115+
apt-get remove --purge -yq \
116+
php7.2-dev \
117+
pkg-config \
118+
build-essential \
119+
cpp \
120+
cpp-7 \
121+
gcc \
122+
&& \
123+
/bin/bash /clean.sh \
124+
&& \
125+
phpenmod memcached && \
101126
phpdismod pdo_pgsql && \
102127
phpdismod pgsql && \
103128
phpdismod redis && \
104129
phpdismod yaml && \
105130
phpdismod xdebug && \
106131
# Remove extra extensions installed via packages for other versions of PHP, leaving the active engine folder
107-
rm -rf /usr/lib/php/20121212 && \
108-
rm -rf /usr/lib/php/20131226 && \
109-
rm -rf /usr/lib/php/20151012 && \
110-
rm -rf /usr/lib/php/20160303 && \
111-
rm -rf /usr/lib/php/20180731 && \
112-
rm -rf /usr/lib/php/20190902 && \
132+
cd /usr/lib/php && \
133+
ls -d */ | grep '[0-9]\{8\}' | grep -v ${PHP_ENGINE_VERSION} | xargs rm -rf && \
113134
# Remove unused agents for other PHP versions
114-
cd /usr/lib/newrelic-php5/agent/x64 && ls | grep -v newrelic-20170718.so | xargs rm && \
135+
cd /usr/lib/newrelic-php5/agent/x64 && ls | grep -v newrelic-${PHP_ENGINE_VERSION}.so | xargs rm && \
115136
cd / && \
116137
curl -sS https://getcomposer.org/installer | php && \
117138
mv composer.phar /usr/local/bin/composer && \

‎Dockerfile-7.3‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM behance/docker-nginx:8.7
1+
FROM behance/docker-nginx:8.8
22
LABEL maintainers="Behance Team <[email protected]>"
33

44
# Set TERM to suppress warning messages.
@@ -23,6 +23,7 @@ ENV CONF_PHPFPM=/etc/php/7.3/fpm/php-fpm.conf \
2323
PHP_OPCACHE_MEMORY_CONSUMPTION=128 \
2424
PHP_OPCACHE_INTERNED_STRINGS_BUFFER=16 \
2525
PHP_OPCACHE_MAX_WASTED_PERCENTAGE=5 \
26+
PHP_ENGINE_VERSION=20180731 \
2627
CFG_APP_DEBUG=1
2728

2829
# - Update security packages, only
@@ -56,6 +57,11 @@ COPY container/root/usr/local/bin/pecl-install /usr/local/bin
5657
RUN apt-get update -q && \
5758
# Ensure PHP 5.5 + 5.6 + 7.1 don't accidentally get added by PPA
5859
apt-mark hold \
60+
manpages \
61+
manpages-dev \
62+
apache2 \
63+
apache2-bin \
64+
libapache2-mod-php7.3 \
5965
php5.6-cli \
6066
php5.6-common \
6167
php5.6-json \
@@ -80,38 +86,53 @@ RUN apt-get update -q && \
8086
php7.3-curl \
8187
php7.3-fpm \
8288
php7.3-gd \
83-
php7.3-igbinary \
8489
php7.3-intl \
8590
php7.3-json \
8691
php7.3-mbstring \
8792
php7.3-memcache \
88-
php7.3-memcached \
89-
php7.3-msgpack \
9093
php7.3-mysql \
9194
php7.3-pgsql \
92-
php7.3-redis \
9395
php7.3-xdebug \
9496
php7.3-xml \
9597
php7.3-yaml \
9698
php7.3-zip \
9799
newrelic-php5 \
98100
newrelic-php5-common \
99101
newrelic-daemon \
102+
# below required to compile non-packaged extensions
103+
php7.3-dev \
104+
pkg-config \
105+
libmemcached-dev \
106+
pkg-config \
107+
zlib1g-dev \
100108
&& \
109+
pecl-install \
110+
igbinary \
111+
memcached \
112+
msgpack \
113+
redis \
114+
&& \
115+
apt-get remove --purge -yq \
116+
php7.3-dev \
117+
pkg-config \
118+
build-essential \
119+
cpp \
120+
cpp-7 \
121+
gcc \
122+
&& \
123+
/bin/bash /clean.sh \
124+
&& \
125+
phpenmod memcached && \
101126
phpdismod pdo_pgsql && \
102127
phpdismod pgsql && \
103128
phpdismod redis && \
104129
phpdismod yaml && \
105130
phpdismod xdebug && \
106131
# Remove extra extensions installed via packages for other versions of PHP, leaving the active engine folder
107-
rm -rf /usr/lib/php/20121212 && \
108-
rm -rf /usr/lib/php/20131226 && \
109-
rm -rf /usr/lib/php/20151012 && \
110-
rm -rf /usr/lib/php/20160303 && \
111-
rm -rf /usr/lib/php/20170718 && \
112-
rm -rf /usr/lib/php/20190902 && \
132+
cd /usr/lib/php && \
133+
ls -d */ | grep '[0-9]\{8\}' | grep -v ${PHP_ENGINE_VERSION} | xargs rm -rf && \
113134
# Remove unused agents for other PHP versions
114-
cd /usr/lib/newrelic-php5/agent/x64 && ls | grep -v newrelic-20180731.so | xargs rm && \
135+
cd /usr/lib/newrelic-php5/agent/x64 && ls | grep -v newrelic-${PHP_ENGINE_VERSION}.so | xargs rm && \
115136
cd / && \
116137
curl -sS https://getcomposer.org/installer | php && \
117138
mv composer.phar /usr/local/bin/composer && \

‎Dockerfile-7.3-alpine‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM behance/docker-nginx:8.7-alpine
1+
FROM behance/docker-nginx:8.8-alpine
22
LABEL maintainers="Behance Team <[email protected]>"
33

44
# Set TERM to suppress warning messages.
@@ -23,6 +23,7 @@ ENV CONF_PHPFPM=/etc/php7/php-fpm.conf \
2323
PHP_OPCACHE_MEMORY_CONSUMPTION=128 \
2424
PHP_OPCACHE_INTERNED_STRINGS_BUFFER=16 \
2525
PHP_OPCACHE_MAX_WASTED_PERCENTAGE=5 \
26+
PHP_ENGINE_VERSION=20180731 \
2627
CFG_APP_DEBUG=1
2728

2829
RUN apk update && \
@@ -96,8 +97,8 @@ RUN NEWRELIC_MUSL_PATH=$(curl -s https://download.newrelic.com/php_agent/release
9697
NEWRELIC_DIRECTORY=/root/$(basename $(find . -maxdepth 1 -type d -name newrelic\*)) && \
9798
cd $NEWRELIC_DIRECTORY && \
9899
echo "\n" | ./newrelic-install install && \
99-
chown root:root $NEWRELIC_DIRECTORY/agent/x64/newrelic-20160303.so && \
100-
mv $NEWRELIC_DIRECTORY/agent/x64/newrelic-20180731.so /usr/lib/php7/modules/newrelic.so && \
100+
chown root:root $NEWRELIC_DIRECTORY/agent/x64/newrelic-${PHP_ENGINE_VERSION}.so && \
101+
mv $NEWRELIC_DIRECTORY/agent/x64/newrelic-${PHP_ENGINE_VERSION}.so /usr/lib/php7/modules/newrelic.so && \
101102
rm -rf $NEWRELIC_DIRECTORY/agent/x64 && \
102103
# Fix permissions on extracted folder \
103104
chown -R $NOT_ROOT_USER:$NOT_ROOT_USER * && \

0 commit comments

Comments
 (0)