Update to version 4.8.5

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>

.travis.yml

@@ -1,7 +1,3 @@
-dist: trusty
-
-sudo: required
-
 services:
   - docker
 

Dockerfile

@@ -29,7 +29,7 @@ RUN set -ex; \
     apk del .build-deps
 
 # Calculate download URL
-ENV VERSION 4.8.2
+ENV VERSION 4.8.5
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
 LABEL version=$VERSION
 
@@ -43,25 +43,21 @@ RUN set -ex; \
     export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
     curl --output phpMyAdmin.tar.xz --location $URL; \
     curl --output phpMyAdmin.tar.xz.asc --location $URL.asc; \
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
-        || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
-        || gpg --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \
-        || gpg --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
-        || gpg --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
+        || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
+        || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \
+        || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
+        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
     gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \
-    tar -xf phpMyAdmin.tar.xz; \
+    tar -xf phpMyAdmin.tar.xz -C /usr/src; \
     gpgconf --kill all; \
     rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.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 nobody:nogroup /www; \
-    find /www -type d -exec chmod 750 {} \; ; \
-    find /www -type f -exec chmod 640 {} \; ; \
+    mv /usr/src/phpMyAdmin-$VERSION-all-languages /usr/src/phpmyadmin; \
+    rm -rf /usr/src/phpmyadmin/setup/ /usr/src/phpmyadmin/examples/ /usr/src/phpmyadmin/test/ /usr/src/phpmyadmin/po/ /usr/src/phpmyadmin/composer.json /usr/src/phpmyadmin/RELEASE-DATE-$VERSION; \
+    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /usr/src/phpmyadmin/libraries/vendor_config.php; \
 # Add directory for sessions to allow session persistence
     mkdir /sessions; \
-    mkdir -p /www/tmp; \
-    chmod -R 777 /www/tmp; \
+    mkdir -p /var/nginx/client_body_temp; \
     apk del .fetch-deps
 
 # Copy configuration
@@ -75,4 +71,4 @@ COPY run.sh /run.sh
 EXPOSE 80
 
 ENTRYPOINT [ "/run.sh" ]
-CMD ["supervisord", "-n"]
+CMD ["supervisord", "-n", "-j", "/supervisord.pid"]

README.md

@@ -27,10 +27,8 @@ The official MySQL and MariaDB use following environment variables to define the
 You can use following tags on Docker hub:
 
 * `latest` - latest stable release
-* `4.6` - latest stable release from the 4.6 branch
-* `4.7` - latest stable release from the 4.7 branch
+* `4.8` - latest stable release for the 4.8 version
 * `edge` - bleeding edge docker image (contains stable phpMyAdmin, but the Docker image changes might not yet be fully tested)
-* `edge-4.7` - bleeding edge docker image + latest snapshots from 4.7 branch
 * `edge-4.8` - bleeding edge docker image + latest snapshots from 4.8 branch (currently master)
 
 ## Usage with linked server

etc/nginx.conf

@@ -1,4 +1,3 @@
-user nobody nogroup;
 worker_processes 4;
 
 daemon off;
@@ -53,7 +52,7 @@ http {
         listen 80 default_server;
         server_name _;
 
-        root /www;
+        root /var/www/html;
 
         index index.php index.html index.htm;
 
@@ -73,7 +72,7 @@ http {
 
         location ~ \.php$ {
             fastcgi_intercept_errors on;
-            fastcgi_pass unix:/var/run/php/php-fpm.sock;
+            fastcgi_pass 127.0.0.1:9000;
 
             # regex to split $uri to $fastcgi_script_name and $fastcgi_path
             fastcgi_split_path_info ^(.+\.php)(/.+)$;

etc/php-fpm.conf

@@ -1,17 +0,0 @@
-[global]
-error_log = /var/log/php-fpm.log
-log_level = warning
-
-[www]
-user = nobody
-group = nogroup
-listen = /var/run/php/php-fpm.sock
-listen.mode = 0660
-chdir = /www
-pm = dynamic
-pm.max_children = 5
-pm.start_servers = 2
-pm.min_spare_servers = 1
-pm.max_spare_servers = 3
-catch_workers_output = Yes
-clear_env = No

etc/phpmyadmin/config.inc.php

@@ -11,6 +11,8 @@ $vars = array(
     'PMA_VERBOSES',
     'PMA_PORT',
     'PMA_PORTS',
+    'PMA_SOCKET',
+    'PMA_SOCKETS',
     'PMA_USER',
     'PMA_PASSWORD',
     'PMA_ABSOLUTE_URI',
@@ -52,9 +54,14 @@ if (!empty($_ENV['PMA_HOST'])) {
     $verbose = array($_ENV['PMA_VERBOSE']);
     $ports = array($_ENV['PMA_PORT']);
 } elseif (!empty($_ENV['PMA_HOSTS'])) {
-    $hosts = explode(',', $_ENV['PMA_HOSTS']);
-    $verbose = explode(',', $_ENV['PMA_VERBOSES']);
-    $ports = explode(',', $_ENV['PMA_PORTS']);
+    $hosts = array_map('trim', explode(',', $_ENV['PMA_HOSTS']));
+    $verbose = array_map('trim', explode(',', $_ENV['PMA_VERBOSES']));
+    $ports = array_map('trim', explode(',', $_ENV['PMA_PORTS']));
+}
+if (!empty($_ENV['PMA_SOCKET'])) {
+    $sockets = array($_ENV['PMA_SOCKET']);
+} elseif (!empty($_ENV['PMA_SOCKETS'])) {
+    $sockets = explode(',', $_ENV['PMA_SOCKETS']);
 }
 
 /* Server settings */
@@ -110,6 +117,10 @@ for ($i = 1; isset($hosts[$i - 1]); $i++) {
     $cfg['Servers'][$i]['compress'] = false;
     $cfg['Servers'][$i]['AllowNoPassword'] = true;
 }
+for ($i = 1; isset($sockets[$i - 1]); $i++) {
+    $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];
+    $cfg['Servers'][$i]['host'] = 'localhost';
+}
 /*
  * Revert back to last configured server to make
  * it easier in config.user.inc.php

etc/supervisor.d/php.ini

@@ -1,6 +1,5 @@
 [program:php-fpm]
-command=php-fpm --nodaemonize --fpm-config /etc/php-fpm.conf
-user=nobody
+command=php-fpm --nodaemonize --fpm-config /usr/local/etc/php-fpm.conf
 autostart=true
 autorestart=true
 priority=1

php.ini

@@ -2,7 +2,7 @@
 allow_url_fopen = Off
 max_execution_time = 600
 memory_limit = 512M
-open_basedir = /www/:/tmp/:/etc/phpmyadmin/
+open_basedir = /var/www/html:/tmp/:/etc/phpmyadmin/
 post_max_size = 512M
 upload_max_filesize = 512M
 

run.sh

@@ -1,20 +1,50 @@
 #!/bin/sh
-if [ ! -f /etc/phpmyadmin/config.secret.inc.php ]; then
-    cat > /etc/phpmyadmin/config.secret.inc.php <<EOT
+if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ] || [ "$1" == supervisord ] ; then
+    if [ "$(id -u)" = '0' ]; then
+        case "$1" in
+            apache2*)
+                user="${APACHE_RUN_USER:-www-data}"
+                group="${APACHE_RUN_GROUP:-www-data}"
+                ;;
+            *) # php-fpm
+                user='www-data'
+                group='www-data'
+                ;;
+        esac
+    else
+        user="$(id -u)"
+        group="$(id -g)"
+    fi
+
+    chown www-data:www-data /sessions /var/nginx/client_body_temp
+
+    if ! [ -e index.php -a -e db_designer.php ]; then
+        echo >&2 "phpMyAdmin not found in $PWD - copying now..."
+        if [ "$(ls -A)" ]; then
+            echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"
+            ( set -x; ls -A; sleep 10 )
+        fi
+        tar --create \
+            --file - \
+            --one-file-system \
+            --directory /usr/src/phpmyadmin \
+            --owner "$user" --group "$group" \
+            . | tar --extract --file -
+        echo >&2 "Complete! phpMyAdmin has been successfully copied to $PWD"
+        mkdir -p tmp; \
+        chmod -R 777 tmp; \
+    fi
+
+    if [ ! -f /etc/phpmyadmin/config.secret.inc.php ]; then
+        cat > /etc/phpmyadmin/config.secret.inc.php <<EOT
 <?php
 \$cfg['blowfish_secret'] = '$(tr -dc 'a-zA-Z0-9~!@#$%^&*_()+}{?></";.,[]=-' < /dev/urandom | fold -w 32 | head -n 1)';
 EOT
-fi
+    fi
 
-if [ ! -f /etc/phpmyadmin/config.user.inc.php ]; then
-    touch /etc/phpmyadmin/config.user.inc.php
+    if [ ! -f /etc/phpmyadmin/config.user.inc.php ]; then
+        touch /etc/phpmyadmin/config.user.inc.php
+    fi
 fi
 
-mkdir -p /var/nginx/client_body_temp
-chown nobody:nogroup /sessions /var/nginx/client_body_temp
-mkdir -p /var/run/php/
-chown nobody:nogroup /var/run/php/
-touch /var/log/php-fpm.log
-chown nobody:nogroup /var/log/php-fpm.log
-
 exec "$@"