diff --git a/Dockerfile b/Dockerfile index da871e5..94ad81c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,10 @@ RUN set -xe && \ apk update && apk upgrade && \ apk add --no-cache --virtual=run-deps \ nginx git ca-certificates curl \ - php5 php5-fpm php5-curl php5-dom php5-gd php5-json php5-mcrypt php5-pcntl \ - php5-pdo php5-pdo_pgsql php5-pgsql php5-pdo_mysql php5-mysql php5-mysqli php5-posix + php7 php7-fpm php7-curl php7-dom php7-gd php7-iconv php7-json php7-mcrypt \ + php7-pgsql php7-pcntl php7-pdo php7-pdo_pgsql \ + php7-mysqli php7-pdo_mysql \ + php7-mbstring php7-posix php7-session # Add user www-data for php-fpm. # 82 is the standard uid/gid for "www-data" in Alpine. diff --git a/root/etc/cont-init.d/50-php b/root/etc/cont-init.d/50-php index bbbf57d..fa83167 100644 --- a/root/etc/cont-init.d/50-php +++ b/root/etc/cont-init.d/50-php @@ -2,10 +2,9 @@ # Make sure to have a defined set of PHP binaries, # regardless of how the package maintainer(s) named those. -if [ ! -f /usr/bin/php ]; then - ln -s /usr/bin/php5 /usr/bin/php -fi -if [ ! -f /usr/bin/php-fpm ]; then - ln -s /usr/bin/php-fpm5 /usr/bin/php-fpm -fi +rm /usr/bin/php +ln -s /usr/bin/php7 /usr/bin/php + +rm /usr/sbin/php-fpm +ln -s /usr/sbin/php-fpm7 /usr/sbin/php-fpm diff --git a/root/etc/php5/php-fpm.conf b/root/etc/php7/php-fpm.conf similarity index 100% rename from root/etc/php5/php-fpm.conf rename to root/etc/php7/php-fpm.conf