Merge pull request #102 from nijel/alpine-3.5

Upgrade to Alpine 3.5
phpmyadmin · Jan 2, 2017 · ff50a29 · ff50a29
2 parents 4bc799b + e943ff3
commit ff50a29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-FROM alpine:3.4
+FROM alpine:3.5
 
 # Install dependencies
-RUN apk add --no-cache php5-mysqli php5-xml php5-gd php5-zlib php5-bz2 php5-zip php5-openssl php5-curl php5-opcache php5-json nginx php5-fpm supervisor
+RUN apk add --no-cache php7-session php7-mysqli php7-mbstring php7-xml php7-gd php7-zlib php7-bz2 php7-zip php7-openssl php7-curl php7-opcache php7-json nginx php7-fpm supervisor
 
 # Include keyring to verify download
 COPY phpmyadmin.keyring /

diff --git a/etc/supervisor.d/php.ini b/etc/supervisor.d/php.ini
@@ -1,5 +1,5 @@
 [program:php-fpm]
-command=php-fpm --nodaemonize --fpm-config /etc/php-fpm.conf -c /etc/php.ini
+command=php-fpm7 --nodaemonize --fpm-config /etc/php-fpm.conf -c /etc/php.ini
 user=nobody
 autostart=true
 autorestart=true