Skip to content

Use PHP 7.3 for NC 15 #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
J0WI merged 4 commits into from
Jan 14, 2019
Merged

Use PHP 7.3 for NC 15 #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ecaf51
Use PHP 7.3 for NC 15
J0WI Dec 10, 2018
5bd47f8
Update php-memcached to 3.1.2 and APCu to 5.1.16
J0WI Dec 22, 2018
06c299c
Update memcached to 3.1.3
J0WI Jan 5, 2019
46c774c
Set default PHP version to 7.3
J0WI Jan 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions 13.0/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
libcurl4-openssl-dev \
libevent-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
Expand Down Expand Up @@ -52,8 +53,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
Expand Down
5 changes: 3 additions & 2 deletions 13.0/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RUN set -ex; \
autoconf \
freetype-dev \
icu-dev \
libevent-dev \
libjpeg-turbo-dev \
libmcrypt-dev \
libpng-dev \
Expand All @@ -46,8 +47,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
Expand Down
5 changes: 3 additions & 2 deletions 13.0/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
libcurl4-openssl-dev \
libevent-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
Expand Down Expand Up @@ -52,8 +53,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
Expand Down
5 changes: 3 additions & 2 deletions 14.0/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
libcurl4-openssl-dev \
libevent-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
Expand Down Expand Up @@ -52,8 +53,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
Expand Down
5 changes: 3 additions & 2 deletions 14.0/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RUN set -ex; \
autoconf \
freetype-dev \
icu-dev \
libevent-dev \
libjpeg-turbo-dev \
libmcrypt-dev \
libpng-dev \
Expand All @@ -46,8 +47,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
Expand Down
5 changes: 3 additions & 2 deletions 14.0/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
libcurl4-openssl-dev \
libevent-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
Expand Down Expand Up @@ -52,8 +53,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
Expand Down
8 changes: 5 additions & 3 deletions 15.0/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.2-apache-stretch
FROM php:7.3-apache-stretch

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand All @@ -24,6 +24,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
libcurl4-openssl-dev \
libevent-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
Expand All @@ -34,6 +35,7 @@ RUN set -ex; \
libpq-dev \
libxml2-dev \
libmagickwand-dev \
libzip-dev \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
Expand All @@ -52,8 +54,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
Expand Down
8 changes: 5 additions & 3 deletions 15.0/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
FROM php:7.2-fpm-alpine3.8
FROM php:7.3-fpm-alpine3.8

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand All @@ -20,11 +20,13 @@ RUN set -ex; \
autoconf \
freetype-dev \
icu-dev \
libevent-dev \
libjpeg-turbo-dev \
libmcrypt-dev \
libpng-dev \
libmemcached-dev \
libxml2-dev \
libzip-dev \
openldap-dev \
pcre-dev \
postgresql-dev \
Expand All @@ -46,8 +48,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
Expand Down
8 changes: 5 additions & 3 deletions 15.0/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.2-fpm-stretch
FROM php:7.3-fpm-stretch

# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
Expand All @@ -24,6 +24,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
libcurl4-openssl-dev \
libevent-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
Expand All @@ -34,6 +35,7 @@ RUN set -ex; \
libpq-dev \
libxml2-dev \
libmagickwand-dev \
libzip-dev \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
Expand All @@ -52,8 +54,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@ RUN set -ex; \
autoconf \
freetype-dev \
icu-dev \
libevent-dev \
libjpeg-turbo-dev \
libmcrypt-dev \
libpng-dev \
libmemcached-dev \
libxml2-dev \
libzip-dev \
openldap-dev \
pcre-dev \
postgresql-dev \
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile-debian.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
libcurl4-openssl-dev \
libevent-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
Expand All @@ -33,6 +34,7 @@ RUN set -ex; \
libpq-dev \
libxml2-dev \
libmagickwand-dev \
libzip-dev \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
Expand Down
18 changes: 13 additions & 5 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
set -eo pipefail

declare -A php_version=(
[default]='7.2'
[12.0]='7.1'
[default]='7.3'
[14.0]='7.2'
[13.0]='7.2'
)

declare -A cmd=(
Expand All @@ -25,8 +26,8 @@ declare -A extras=(
)

declare -A pecl_versions=(
[APCu]='5.1.15'
[memcached]='3.0.4'
[APCu]='5.1.16'
[memcached]='3.1.3'
[redis]='4.2.0'
[imagick]='3.4.3'
)
Expand Down Expand Up @@ -58,6 +59,7 @@ travisEnv=

function create_variant() {
dir="$1/$variant"
phpVersion=${php_version[$version]-${php_version[default]}}

# Create the version+variant directory with a Dockerfile.
mkdir -p "$dir"
Expand All @@ -70,7 +72,7 @@ function create_variant() {

# Replace the variables.
sed -ri -e '
s/%%PHP_VERSION%%/'"${php_version[$version]-${php_version[default]}}"'/g;
s/%%PHP_VERSION%%/'"$phpVersion"'/g;
s/%%VARIANT%%/'"$variant"'/g;
s/%%VERSION%%/'"$fullversion"'/g;
s/%%BASE_DOWNLOAD_URL%%/'"$2"'/g;
Expand All @@ -82,6 +84,12 @@ function create_variant() {
s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
' "$dir/Dockerfile"

if [[ "$phpVersion" != 7.3 ]]; then
sed -ri \
-e '/libzip-dev/d' \
"$dir/Dockerfile"
fi

# Copy the shell scripts
for name in entrypoint cron; do
cp "docker-$name.sh" "$dir/$name.sh"
Expand Down