Update to 4.6

Fixes #105

Signed-off-by: Michal Čihař <michal@cihar.com>

.dockerignore

@@ -4,3 +4,7 @@ docker-compose.testing.yml
 README.md
 LICENSE
 Makefile
+world.sql
+test-docker.sh
+phpmyadmin_test.py
+config.test.inc.php

.travis.yml

@@ -5,37 +5,27 @@ services:
 
 env:
   matrix:
-    - DB=mysql:5.7
-    - DB=mariadb:10.0
+    - DB=mysql:latest
+    - DB=mariadb:latest
 
 before_install:
   - docker run --name db_server -e MYSQL_ROOT_PASSWORD=my-secret-pw -d $DB
 
+install:
+  - pip install mechanize
+
 script:
   # Build image
   - docker build -t phpmyadmin/phpmyadmin .
   # Test for single database
   - docker run --name testadmin -d --link db_server:db -p 9090:80 phpmyadmin/phpmyadmin
-  - docker ps -a
-  - curl http://127.0.0.1:9090/ | grep -q input_password
-  - curl --cookie-jar /tmp/cj --location -d pma_username=root -d pma_password=my-secret-pw -d server=1 http://127.0.0.1:9090/ | grep -r 'db via TCP'
+  - ./test-docker.sh testadmin 9090
   # Test for single database using env
   - docker run --name envadmin -d --link db_server:db2 -e PMA_HOST=db2 -p 6060:80 phpmyadmin/phpmyadmin
-  - docker ps -a
-  - curl http://127.0.0.1:6060/ | grep -q input_password
-  - curl --cookie-jar /tmp/cj --location -d pma_username=root -d pma_password=my-secret-pw -d server=1 http://127.0.0.1:6060/ | grep -r 'db2 via TCP'
+  - ./test-docker.sh envadmin 6060
   # Test for arbitrary database
-  - docker run --name arbitraryadmin -d --link db_server:db -e PMA_ARBITRARY=1 -p 7070:80 phpmyadmin/phpmyadmin
-  - docker ps -a
-  - curl http://127.0.0.1:7070/ | grep -q input_password
-  - curl --cookie-jar /tmp/cj --location -d pma_servername=db -d pma_username=root -d pma_password=my-secret-pw -d server=1 http://127.0.0.1:7070/ | grep -r 'db via TCP'
-  # Test docker-compose
-  - docker-compose up -d
-  - docker ps -a
-  - curl http://127.0.0.1:8080/ | grep -q input_password
-  - curl --cookie-jar /tmp/cj --location -d pma_servername=db -d pma_username=root -d pma_password=my-secret-pw -d server=1 http://127.0.0.1:8080/ | grep -r 'db via TCP'
-  - docker-compose stop
-  # Test session survives shutdown
-  - docker-compose up -d
-  - curl --cookie-jar /tmp/cj --location http://127.0.0.1:8080/ | grep -r 'db via TCP'
-  - docker-compose stop
+  - docker run --name arbitraryadmin -d --link db_server:db3 -e PMA_ARBITRARY=1 -p 7070:80 phpmyadmin/phpmyadmin
+  - ./test-docker.sh arbitraryadmin 7070 db3
+  # Test for arbitrary database with user config
+  - docker run --name userconfigadmin -d --link db_server:db3 -v `readlink -f ./config.test.inc.php`:/etc/phpmyadmin/config.user.inc.php -p 7080:80 phpmyadmin/phpmyadmin
+  - ./test-docker.sh userconfigadmin 7080 db3

Dockerfile

@@ -1,21 +1,52 @@
-# Switch back to stable once 3.4 is out
-FROM alpine:edge
+FROM alpine:3.5
 
-RUN apk add --no-cache php5-cli php5-mysqli php5-ctype php5-xml php5-gd php5-zlib php5-openssl php5-curl php5-opcache php5-json php5-mcrypt curl
+# 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 curl --location https://www.phpmyadmin.net/downloads/phpMyAdmin-latest-all-languages.tar.gz | tar xzf - \
- && mv phpMyAdmin* /www \
- && rm -rf /www/js/jquery/src/ /www/examples /www/po/
+# Include keyring to verify download
+COPY phpmyadmin.keyring /
 
-COPY config.inc.php /www/
+# Copy configuration
+COPY etc /etc/
+
+# Copy main script
 COPY run.sh /run.sh
 RUN chmod u+rwx /run.sh
 
+# Calculate download URL
+ENV VERSION 4.6.6
+ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.gz
+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 \
+    && mv /www/doc/html /www/htmldoc \
+    && rm -rf /www/doc \
+    && mkdir /www/doc \
+    && mv /www/htmldoc /www/doc/html \
+    && rm /www/doc/html/.buildinfo /www/doc/html/objects.inv \
+    && rm -rf /www/js/jquery/src/ /www/js/openlayers/src/ /www/setup/ /www/examples/ /www/test/ /www/po/ /www/templates/test/ /www/phpunit.xml.* /www/build.xml  /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 volume for sessions to allow session persistence
 VOLUME /sessions
 
+# We expose phpMyAdmin on port 80
 EXPOSE 80
 
-ENV PHP_UPLOAD_MAX_FILESIZE=64M \
-    PHP_MAX_INPUT_VARS=2000
-
 ENTRYPOINT [ "/run.sh" ]
+CMD ["phpmyadmin"]

README.md

@@ -1,15 +1,34 @@
 # Official phpMyAdmin Docker image
 
-Run phpMyAdmin with Alpine and PHP built in web server.
+Run phpMyAdmin with Alpine, supervisor, nginx and PHP FPM.
 
 [![Build Status](https://travis-ci.org/phpmyadmin/docker.svg?branch=master)](https://travis-ci.org/phpmyadmin/docker)
 [![Docker Pulls](https://img.shields.io/docker/pulls/phpmyadmin/phpmyadmin.svg)][hub]
 [![Docker Stars](https://img.shields.io/docker/stars/phpmyadmin/phpmyadmin.svg)][hub]
+[![Docker Layers](https://images.microbadger.com/badges/image/phpmyadmin/phpmyadmin.svg)](https://microbadger.com/images/phpmyadmin/phpmyadmin "Get your own image badge on microbadger.com")
+[![Docker Version](https://images.microbadger.com/badges/version/phpmyadmin/phpmyadmin.svg)](https://microbadger.com/images/phpmyadmin/phpmyadmin "Get your own version badge on microbadger.com")
 
 
 All following examples will bring you phpMyAdmin on `http://localhost:8080`
 where you can enjoy your happy MySQL administration.
 
+## Credentials
+
+phpMyAdmin does use MySQL server credential, please check the corresponding
+server image for information how it is setup.
+
+The official MySQL and MariaDB use following environment variables to define these:
+
+* `MYSQL_ROOT_PASSWORD` - This variable is mandatory and specifies the password that will be set for the `root` superuser account.
+* `MYSQL_USER`, `MYSQL_PASSWORD` - These variables are optional, used in conjunction to create a new user and to set that user's password.
+
+## Docker hub tags
+
+You can use following tags on Docker hub:
+
+* `latest` - latest stable release
+* `4.6` - latest stable release from the 4.6 branch
+* `edge` - bleeding edge docker image (contains stable phpMyAdmin, but the Docker image changes might not yet be fully tested)
 
 ## Usage with linked server
 
@@ -48,20 +67,41 @@ Using the docker-compose.yml from https://github.com/phpmyadmin/docker
 docker-compose up -d
 ```
 
+## Adding Custom Configuration
+
+You can add your own custom config.inc.php settings (such as Configuration Storage setup) 
+by creating a file named "config.user.inc.php" with the various user defined settings
+in it, and then linking it into the container using:
+
+```
+-v /some/local/directory/config.user.inc.php:/etc/phpmyadmin/config.user.inc.php
+```
+On the "docker run" line like this:
+``` 
+docker run --name myadmin -d --link mysql_db_server:db -p 8080:80 -v /some/local/directory/config.user.inc.php:/etc/phpmyadmin/config.user.inc.php phpmyadmin/phpmyadmin
+```
+
+See the following links for config file information.
+https://docs.phpmyadmin.net/en/latest/config.html#config
+https://docs.phpmyadmin.net/en/latest/setup.html
+
 ## Usage behind reverse proxys
+
 Set the variable ``PMA_ABSOLUTE_URI`` to the fully-qualified path (``https://pma.example.net/``) where the reverse proxy makes phpMyAdmin available.
 
 ## Environment variables summary
 
 * ``PMA_ARBITRARY`` - when set to 1 connection to the arbitrary server will be allowed
 * ``PMA_HOST`` - define address/host name of the MySQL server
+* ``PMA_VERBOSE`` - define verbose name of the MySQL server
 * ``PMA_PORT`` - define port of the MySQL server
 * ``PMA_HOSTS`` - define comma separated list of address/host names of the MySQL servers
+* ``PMA_VERBOSES`` - define comma separated list of verbose names of the MySQL servers
 * ``PMA_USER`` and ``PMA_PASSWORD`` - define username to use for config authentication method
 * ``PMA_ABSOLUTE_URI`` - define user-facing URI
-* ``PHP_UPLOAD_MAX_FILESIZE`` - define upload_max_filesize and post_max_size PHP settings
-* ``PHP_MAX_INPUT_VARS`` - define max_input_vars PHP setting 
 
-For more detailed documentation see http://docs.phpmyadmin.net/en/latest/setup.html#installing-using-docker
+For more detailed documentation see https://docs.phpmyadmin.net/en/latest/setup.html#installing-using-docker
 
 [hub]: https://hub.docker.com/r/phpmyadmin/phpmyadmin/
+
+Please report any issues with the Docker container to https://github.com/phpmyadmin/docker/issues

config.test.inc.php

@@ -0,0 +1,2 @@
+<?php
+$cfg['AllowArbitraryServer'] = true;

docker-compose.yml

@@ -1,6 +1,6 @@
 phpmyadmin:
     image: phpmyadmin/phpmyadmin
-    container_name: myadmin
+    container_name: phpmyadmin
     environment:
      - PMA_ARBITRARY=1
     restart: always

etc/nginx.conf

@@ -0,0 +1,130 @@
+user nobody;
+worker_processes 4;
+
+daemon off;
+
+pid /nginx.pid;
+
+error_log /var/log/nginx-error.log;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    types {
+        text/html                             html htm shtml;
+        text/css                              css;
+        text/xml                              xml;
+        image/gif                             gif;
+        image/jpeg                            jpeg jpg;
+        application/javascript                js;
+        application/atom+xml                  atom;
+        application/rss+xml                   rss;
+    }
+
+    default_type application/octet-stream;
+
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+
+    client_body_timeout 12;
+    client_header_timeout 12;
+    keepalive_timeout 15;
+    send_timeout 10;
+    server_tokens off;
+
+    client_body_buffer_size 512K;
+    client_body_temp_path /var/nginx/client_body_temp;
+    client_header_buffer_size 16k;
+    client_max_body_size 512M;
+    large_client_header_buffers 4 8k;
+
+    gzip on;
+    gzip_comp_level 2;
+    gzip_min_length 1000;
+    gzip_proxied expired no-cache no-store private auth;
+    gzip_types text/plain application/x-javascript text/xml text/css application/xml;
+
+    access_log off;
+
+    server {
+        listen 80 default_server;
+        server_name _;
+
+        root /www;
+
+        index index.php index.html index.htm;
+
+        charset utf-8;
+
+        if ($request_method !~ ^(GET|HEAD|POST)$ ) {
+           return 405;
+        }
+
+        location / {
+            try_files $uri $uri/ =404;
+        }
+
+        location ~* .(jpg|jpeg|png|gif|ico|css|js)$ {
+            expires 365d;
+        }
+
+        location ~ \.php$ {
+            fastcgi_intercept_errors on;
+            fastcgi_pass unix:/var/run/php/php-fpm.sock;
+
+            # regex to split $uri to $fastcgi_script_name and $fastcgi_path
+            fastcgi_split_path_info ^(.+\.php)(/.+)$;
+
+            # Check that the PHP script exists before passing it
+            try_files $fastcgi_script_name =404;
+
+            # Bypass the fact that try_files resets $fastcgi_path_info
+            # see: https://trac.nginx.org/nginx/ticket/321
+            set $path_info $fastcgi_path_info;
+            fastcgi_param PATH_INFO $path_info;
+
+            fastcgi_read_timeout 600;
+            fastcgi_buffering off;
+
+            fastcgi_index index.php;
+
+            fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+            fastcgi_param  QUERY_STRING       $query_string;
+            fastcgi_param  REQUEST_METHOD     $request_method;
+            fastcgi_param  CONTENT_TYPE       $content_type;
+            fastcgi_param  CONTENT_LENGTH     $content_length;
+
+            fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+            fastcgi_param  REQUEST_URI        $request_uri;
+            fastcgi_param  DOCUMENT_URI       $document_uri;
+            fastcgi_param  DOCUMENT_ROOT      $document_root;
+            fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+            fastcgi_param  REQUEST_SCHEME     $scheme;
+            fastcgi_param  HTTPS              $https if_not_empty;
+
+            fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
+            fastcgi_param  SERVER_SOFTWARE    nginx;
+
+            fastcgi_param  REMOTE_ADDR        $remote_addr;
+            fastcgi_param  REMOTE_PORT        $remote_port;
+            fastcgi_param  SERVER_ADDR        $server_addr;
+            fastcgi_param  SERVER_PORT        $server_port;
+            fastcgi_param  SERVER_NAME        $server_name;
+
+            # PHP only, required if PHP was built with --enable-force-cgi-redirect
+            fastcgi_param  REDIRECT_STATUS    200;
+        }
+
+        location ~ /\. {
+            deny  all;
+        }
+
+        location ~ /(libraries|templates) {
+            deny all;
+        }
+
+    }
+}

etc/php-fpm.conf

@@ -0,0 +1,17 @@
+[global]
+error_log = /var/log/php-fpm.log
+log_level = warning
+
+[www]
+user = nobody
+group = nobody
+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

@@ -1,12 +1,14 @@
 <?php
 
-require('./config.secret.inc.php');
+require('/etc/phpmyadmin/config.secret.inc.php');
 
 /* Ensure we got the environment */
 $vars = array(
     'PMA_ARBITRARY',
     'PMA_HOST',
     'PMA_HOSTS',
+    'PMA_VERBOSE',
+    'PMA_VERBOSES',
     'PMA_PORT',
     'PMA_USER',
     'PMA_PASSWORD',
@@ -36,17 +38,22 @@ $hosts = array('db');
 /* Set by environment */
 if (!empty($_ENV['PMA_HOST'])) {
     $hosts = array($_ENV['PMA_HOST']);
+    $verbose = array($_ENV['PMA_VERBOSE']);
 } elseif (!empty($_ENV['PMA_HOSTS'])) {
     $hosts = explode(',', $_ENV['PMA_HOSTS']);
+    $verbose = explode(',', $_ENV['PMA_VERBOSES']);
 }
 
 /* Server settings */
 for ($i = 1; isset($hosts[$i - 1]); $i++) {
     $cfg['Servers'][$i]['host'] = $hosts[$i - 1];
+    if (isset($verbose[$i - 1])) {
+        $cfg['Servers'][$i]['verbose'] = $verbose[$i - 1];
+    }
     if (isset($_ENV['PMA_PORT'])) {
         $cfg['Servers'][$i]['port'] = $_ENV['PMA_PORT'];
     }
-    if (isset($_ENV['PMA_USER'])) {                                
+    if (isset($_ENV['PMA_USER'])) {
         $cfg['Servers'][$i]['auth_type'] = 'config';
         $cfg['Servers'][$i]['user'] = $_ENV['PMA_USER'];
         $cfg['Servers'][$i]['password'] = isset($_ENV['PMA_PASSWORD']) ? $_ENV['PMA_PASSWORD'] : null;
@@ -61,3 +68,8 @@ for ($i = 1; isset($hosts[$i - 1]); $i++) {
 /* Uploads setup */
 $cfg['UploadDir'] = '';
 $cfg['SaveDir'] = '';
+
+/* Include User Defined Settings Hook */
+if (file_exists('/etc/phpmyadmin/config.user.inc.php')) {
+    include('/etc/phpmyadmin/config.user.inc.php');
+}

etc/supervisor.d/nginx.ini

@@ -0,0 +1,12 @@
+[program:nginx]
+command=nginx -c /etc/nginx.conf
+autostart=true
+autorestart=true
+priority=2
+startretries=3
+stopwaitsecs=10
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+

etc/supervisor.d/php.ini

@@ -0,0 +1,13 @@
+[program:php-fpm]
+command=php-fpm7 --nodaemonize --fpm-config /etc/php-fpm.conf -c /etc/php.ini
+user=nobody
+autostart=true
+autorestart=true
+priority=1
+startretries=3
+stopwaitsecs=10
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+

phpmyadmin_test.py

@@ -0,0 +1,59 @@
+#!/usr/bin/env python
+import argparse
+import re
+import sys
+
+import mechanize
+
+
+def test_content(match, content):
+    if not match in content:
+        print content
+        raise Exception('{0} not found in content!'.format(match))
+
+
+def test_phpmyadmin(url, username, password, server=None, sqlfile='world.sql'):
+    br = mechanize.Browser()
+
+    # Ignore robots.txt
+    br.set_handle_robots(False)
+
+    # Login page
+    br.open(url)
+
+    # Fill login form
+    br.select_form('login_form')
+    br['pma_username'] = username
+    br['pma_password'] = password
+    if server is not None:
+        br['pma_servername'] = server
+
+    # Login and check if loggged in
+    response = br.submit()
+    test_content('Server version', response.read())
+
+    # Open server import
+    response = br.follow_link(text_regex=re.compile('Import'))
+    test_content('OpenDocument Spreadsheet', response.read())
+
+    # Upload SQL file
+    br.select_form('import')
+    br.form.add_file(open(sqlfile), 'text/plain', sqlfile)
+    response = br.submit()
+    test_content('5326 queries executed', response.read())
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--url', required=True)
+    parser.add_argument('--username', required=True)
+    parser.add_argument('--password', required=True)
+    parser.add_argument('--server')
+    parser.add_argument('--sqlfile', default='world.sql')
+    args = parser.parse_args()
+
+    test_phpmyadmin(args.url, args.username, args.password, args.server, args.sqlfile)
+
+
+if __name__ == '__main__':
+    main()

run.sh

@@ -1,15 +1,22 @@
 #!/bin/sh
-set -x
-
-if [ ! -f /www/config.secret.inc.php ] ; then
-    cat > /www/config.secret.inc.php <<EOT
+if [ ! -f /etc/phpmyadmin/config.secret.inc.php ] ; then
+    cat > /etc/phpmyadmin/config.secret.inc.php <<EOT
 <?php
-\$cfg['blowfish_secret'] = '`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`';
+\$cfg['blowfish_secret'] = '$(tr -dc 'a-zA-Z0-9~!@#$%^&*_()+}{?></";.,[]=-' < /dev/urandom | fold -w 32 | head -n 1)';
 EOT
 fi
 
-exec php -S 0.0.0.0:80 -t /www/ \
-    -d upload_max_filesize=$PHP_UPLOAD_MAX_FILESIZE \
-    -d post_max_size=$PHP_UPLOAD_MAX_FILESIZE \
-    -d max_input_vars=$PHP_MAX_INPUT_VARS \
-    -d session.save-path=/sessions
+if [ ! -f /etc/phpmyadmin/config.user.inc.php ] ; then
+  touch /etc/phpmyadmin/config.user.inc.php
+fi
+
+mkdir -p /var/nginx/client_body_temp
+chown nobody:nobody /sessions /var/nginx/client_body_temp
+mkdir -p /var/run/php/
+chown nobody:nobody /var/run/php/
+touch /var/log/php-fpm.log
+chown nobody:nobody /var/log/php-fpm.log
+
+if [ "$1" = 'phpmyadmin' ]; then
+    exec supervisord --nodaemon --configuration="/etc/supervisord.conf" --loglevel=info
+fi

test-docker.sh

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+set -x
+
+NAME="$1"
+PORT="$2"
+if [ -n "$3" ] ; then
+    SERVER="--server $3"
+else
+    SERVER=''
+fi
+
+URL=http://127.0.0.1:$PORT/
+
+# Wait for container to start
+ret=0
+TIMEOUT=0
+while ! docker exec "$NAME" ps aux | grep -q nginx ; do
+    echo 'Waiting for start...'
+    sleep 1
+    TIMEOUT=$((TIMEOUT + 1))
+    if [ $TIMEOUT -gt 10 ] ; then
+        echo "Failed to wait!"
+        ret=1
+        exit 1
+    fi
+done
+
+# Perform tests
+if [ $ret -eq 0 ] ; then
+    python phpmyadmin_test.py --url "$URL" --username root --password my-secret-pw $SERVER
+    ret=$?
+fi
+
+# Show debug output in case of failure
+if [ $ret -ne 0 ] ; then
+    curl "$URL"
+    docker ps -a
+    docker exec "$NAME" ps faux
+    docker exec "$NAME" cat /var/log/php-fpm.log
+    docker exec "$NAME" cat /var/log/nginx-error.log
+    docker exec "$NAME" cat /var/log/supervisord.log
+    exit $ret
+fi
+
+# List processes
+docker exec "$NAME" ps faux