Merge remote-tracking branch 'origin/pull/144'

Author: nijel

Dockerfile

@@ -1,7 +1,27 @@
-FROM alpine:3.7
+FROM php:7.2-fpm-alpine
 
 # Install dependencies
-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
+RUN apk add --no-cache --virtual .build-deps \
+		bzip2-dev \
+		freetype-dev \
+		libjpeg-turbo-dev \
+		libpng-dev \
+		libwebp-dev \
+		libxpm-dev \
+	; \
+	\
+	docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \
+	docker-php-ext-install bz2 gd mysqli opcache zip; \
+	\
+	runDeps="$( \
+		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
+			| tr ',' '\n' \
+			| sort -u \
+			| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+	)"; \
+	apk add --virtual .phpmyadmin-phpexts-rundeps $runDeps; \
+	apk del .build-deps; \
+	apk add --no-cache nginx supervisor
 
 # Include keyring to verify download
 COPY phpmyadmin.keyring /
@@ -20,22 +40,22 @@ LABEL version=$VERSION
 
 # Download tarball, verify it using gpg and extract
 RUN set -x \
-    && GNUPGHOME="$(mktemp -d)" \
-    && export GNUPGHOME \
-    && apk add --no-cache curl gnupg \
-    && curl --output phpMyAdmin.tar.gz --location $URL \
-    && curl --output phpMyAdmin.tar.gz.asc --location $URL.asc \
-    && gpgv --keyring /phpmyadmin.keyring phpMyAdmin.tar.gz.asc phpMyAdmin.tar.gz \
-    && apk del --no-cache curl gnupg \
-    && rm -rf "$GNUPGHOME" \
-    && tar xzf phpMyAdmin.tar.gz \
-    && rm -f phpMyAdmin.tar.gz phpMyAdmin.tar.gz.asc \
-    && mv phpMyAdmin-$VERSION-all-languages /www \
-    && rm -rf /www/setup/ /www/examples/ /www/test/ /www/po/ /www/composer.json /www/RELEASE-DATE-$VERSION \
-    && sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /www/libraries/vendor_config.php \
-    && chown -R root:nobody /www \
-    && find /www -type d -exec chmod 750 {} \; \
-    && find /www -type f -exec chmod 640 {} \;
+	&& GNUPGHOME="$(mktemp -d)" \
+	&& export GNUPGHOME \
+	&& apk add --no-cache curl gnupg \
+	&& curl --output phpMyAdmin.tar.gz --location $URL \
+	&& curl --output phpMyAdmin.tar.gz.asc --location $URL.asc \
+	&& gpgv --keyring /phpmyadmin.keyring phpMyAdmin.tar.gz.asc phpMyAdmin.tar.gz \
+	&& apk del --no-cache curl gnupg \
+	&& rm -rf "$GNUPGHOME" \
+	&& tar xzf phpMyAdmin.tar.gz \
+	&& rm -f phpMyAdmin.tar.gz phpMyAdmin.tar.gz.asc \
+	&& mv phpMyAdmin-$VERSION-all-languages /www \
+	&& rm -rf /www/setup/ /www/examples/ /www/test/ /www/po/ /www/composer.json /www/RELEASE-DATE-$VERSION \
+	&& sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /www/libraries/vendor_config.php \
+	&& chown -R root:nobody /www \
+	&& find /www -type d -exec chmod 750 {} \; \
+	&& find /www -type f -exec chmod 640 {} \;
 
 # Add directory for sessions to allow session persistence
 RUN mkdir /sessions

etc/supervisor.d/php.ini

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

testing/phpmyadmin_test.py

@@ -15,8 +15,8 @@ def test_content(match, content):
 
 def test_phpmyadmin(url, username, password, server=None, sqlfile=None):
     if sqlfile is None:
-        if os.path.exists('./world.sql'):
-            sqlfile = './world.sql'
+        if os.path.exists('/world.sql'):
+            sqlfile = '/world.sql'
         else:
             sqlfile = './testing/world.sql'
     br = mechanize.Browser()

testing/test-docker.sh

@@ -69,7 +69,9 @@ done
 
 # Perform tests
 if [ $ret -eq 0 ] ; then
-    if [ -f ./phpmyadmin_test.py ] ; then
+    if [ -f /phpmyadmin_test.py ] ; then
+        FILENAME=/phpmyadmin_test.py
+    elif [ -f ./phpmyadmin_test.py ] ; then
         FILENAME=./phpmyadmin_test.py
     else
         FILENAME=./testing/phpmyadmin_test.py