Merge branch 'master' into edge-4.7

They do not come with signatures

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

.github/stale.yml

@@ -1,23 +0,0 @@
-# Configuration for probot-stale - https://github.com/probot/stale
-
-# Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale Issue or Pull Request is closed
-daysUntilClose: 7
-# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking as stale
-staleLabel: wontfix
-# Comment to post when marking as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when removing the stale label. Set to `false` to disable
-unmarkComment: false
-# Comment to post when closing a stale Issue or Pull Request. Set to `false` to disable
-closeComment: false
-# Limit to only `issues` or `pulls`
-only: pulls

.travis.yml

@@ -1,3 +1,7 @@
+dist: trusty
+
+sudo: required
+
 services:
   - docker
 
@@ -8,11 +12,11 @@ python:
 env:
   matrix:
     - DB=mysql:latest
-    - DB=mariadb:10.2
+    - DB=mariadb:latest
 
 before_install:
   - export TESTSUITE_PASSWORD=`openssl rand -base64 30`
-  - docker run --name db_server -e MYSQL_ROOT_PASSWORD=$TESTSUITE_PASSWORD -v $PWD/testing/testing.cnf:/etc/mysql/conf.d/testing.cnf:ro -d $DB
+  - docker run --name db_server -e MYSQL_ROOT_PASSWORD=$TESTSUITE_PASSWORD -d $DB
 
 install:
   - pip install mechanize html5lib

Dockerfile

@@ -1,74 +1,44 @@
-FROM php:7.2-fpm-alpine
-
-RUN apk add --no-cache \
-    nginx \
-    supervisor
+FROM alpine:3.5
 
 # Install dependencies
-RUN set -ex; \
-    \
-    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
+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
 
-# Calculate download URL
-ENV VERSION 4.8.5
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
-LABEL version=$VERSION
-
-# Download tarball, verify it using gpg and extract
-RUN set -ex; \
-    apk add --no-cache --virtual .fetch-deps \
-        gnupg \
-    ; \
-    \
-    export GNUPGHOME="$(mktemp -d)"; \
-    export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
-    curl --output phpMyAdmin.tar.xz --location $URL; \
-    curl --output phpMyAdmin.tar.xz.asc --location $URL.asc; \
-    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 -C /usr/src; \
-    gpgconf --kill all; \
-    rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
-    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 /var/nginx/client_body_temp; \
-    apk del .fetch-deps
+# Include keyring to verify download
+COPY phpmyadmin.keyring /
 
 # Copy configuration
 COPY etc /etc/
-COPY php.ini /usr/local/etc/php/conf.d/php-phpmyadmin.ini
 
 # Copy main script
 COPY run.sh /run.sh
+RUN chmod u+rwx /run.sh
+
+# Calculate download URL
+ENV VERSION 4.7+snapshot
+ENV URL https://files.phpmyadmin.net/snapshots/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 \
+    && apk del --no-cache curl gnupg \
+    && rm -rf "$GNUPGHOME" \
+    && tar xzf phpMyAdmin.tar.gz \
+    && 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
 
 # We expose phpMyAdmin on port 80
 EXPOSE 80
 
 ENTRYPOINT [ "/run.sh" ]
-CMD ["supervisord", "-n", "-j", "/supervisord.pid"]
+CMD ["phpmyadmin"]

README.md

@@ -27,8 +27,10 @@ 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.8` - latest stable release for the 4.8 version
+* `4.6` - latest stable release from the 4.6 branch
+* `4.7` - latest stable release from the 4.7 branch
 * `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
@@ -108,7 +110,6 @@ Set the variable ``PMA_ABSOLUTE_URI`` to the fully-qualified path (``https://pma
 * ``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_PORTS`` -  define comma separated list of ports of the MySQL servers
 * ``PMA_USER`` and ``PMA_PASSWORD`` - define username to use for config authentication method
 * ``PMA_ABSOLUTE_URI`` - define user-facing URI
 

docker-compose.testing.yml

@@ -1,13 +1,17 @@
 version: '2'
 
 services:
-  db_server:
-    image: ${DB}
+  mariadb:
+    image: mariadb:latest
     container_name: phpmyadmin_testing_mariadb
     environment:
       - MYSQL_ROOT_PASSWORD=test123
-    volumes:
-      - ./testing/testing.cnf:/etc/mysql/conf.d/testing.cnf:ro
+
+  mysql:
+    image: mysql:latest
+    container_name: phpmyadmin_testing_mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=test123
 
   phpmyadmin:
     build:
@@ -21,4 +25,5 @@ services:
       - PMA_ARBITRARY=1
       - TESTSUITE_PASSWORD=test123
     depends_on:
-      - db_server
+      - mariadb
+      - mysql

etc/nginx.conf

@@ -1,3 +1,4 @@
+user nobody;
 worker_processes 4;
 
 daemon off;
@@ -52,7 +53,7 @@ http {
         listen 80 default_server;
         server_name _;
 
-        root /var/www/html;
+        root /www;
 
         index index.php index.html index.htm;
 
@@ -72,7 +73,7 @@ http {
 
         location ~ \.php$ {
             fastcgi_intercept_errors on;
-            fastcgi_pass 127.0.0.1:9000;
+            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)(/.+)$;
@@ -87,8 +88,6 @@ http {
 
             fastcgi_read_timeout 1200;
             fastcgi_buffering off;
-            fastcgi_buffers 16 16k;
-            fastcgi_buffer_size 32k;
 
             fastcgi_index index.php;
 

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

@@ -11,17 +11,9 @@ $vars = array(
     'PMA_VERBOSES',
     'PMA_PORT',
     'PMA_PORTS',
-    'PMA_SOCKET',
-    'PMA_SOCKETS',
     'PMA_USER',
     'PMA_PASSWORD',
-    'PMA_ABSOLUTE_URI',
-    'PMA_CONTROLHOST',
-    'PMA_CONTROLPORT',
-    'PMA_PMADB',
-    'PMA_CONTROLUSER',
-    'PMA_CONTROLPASS',
-    'PMA_QUERYHISTORYDB'
+    'PMA_ABSOLUTE_URI'
 );
 foreach ($vars as $var) {
     $env = getenv($var);
@@ -29,9 +21,6 @@ foreach ($vars as $var) {
         $_ENV[$var] = $env;
     }
 }
-if (isset($_ENV['PMA_QUERYHISTORYDB'])) {
-    $cfg['QueryHistoryDB'] = boolval($_ENV['PMA_QUERYHISTORYDB']);
-}
 
 /* Arbitrary server connection */
 if (isset($_ENV['PMA_ARBITRARY']) && $_ENV['PMA_ARBITRARY'] === '1') {
@@ -54,14 +43,9 @@ if (!empty($_ENV['PMA_HOST'])) {
     $verbose = array($_ENV['PMA_VERBOSE']);
     $ports = array($_ENV['PMA_PORT']);
 } elseif (!empty($_ENV['PMA_HOSTS'])) {
-    $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']);
+    $hosts = explode(',', $_ENV['PMA_HOSTS']);
+    $verbose = explode(',', $_ENV['PMA_VERBOSES']);
+    $ports = explode(',', $_ENV['PMA_PORTS']);
 }
 
 /* Server settings */
@@ -80,52 +64,10 @@ for ($i = 1; isset($hosts[$i - 1]); $i++) {
     } else {
         $cfg['Servers'][$i]['auth_type'] = 'cookie';
     }
-    if (isset($_ENV['PMA_PMADB'])) {
-      $cfg['Servers'][$i]['pmadb'] = $_ENV['PMA_PMADB'];
-      $cfg['Servers'][$i]['relation'] = 'pma__relation';
-      $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
-      $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
-      $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
-      $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
-      $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
-      $cfg['Servers'][$i]['history'] = 'pma__history';
-      $cfg['Servers'][$i]['recent'] = 'pma__recent';
-      $cfg['Servers'][$i]['favorite'] = 'pma__favorite';
-      $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
-      $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
-      $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
-      $cfg['Servers'][$i]['users'] = 'pma__users';
-      $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
-      $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
-      $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
-      $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
-      $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
-      $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
-    }
-    if (isset($_ENV['PMA_CONTROLHOST'])) {
-      $cfg['Servers'][$i]['controlhost'] = $_ENV['PMA_CONTROLHOST'];
-    }
-    if (isset($_ENV['PMA_CONTROLPORT'])) {
-      $cfg['Servers'][$i]['controlport'] = $_ENV['PMA_CONTROLPORT'];
-    }
-    if (isset($_ENV['PMA_CONTROLUSER'])) {
-      $cfg['Servers'][$i]['controluser'] = $_ENV['PMA_CONTROLUSER'];
-    }
-    if (isset($_ENV['PMA_CONTROLPASS'])) {
-      $cfg['Servers'][$i]['controlpass'] = $_ENV['PMA_CONTROLPASS'];
-    }
+    $cfg['Servers'][$i]['connect_type'] = 'tcp';
     $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
- */
-$i--;
 
 /* Uploads setup */
 $cfg['UploadDir'] = '';

etc/supervisor.d/php.ini

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

php.ini

@@ -1,20 +0,0 @@
-[PHP]
-allow_url_fopen = Off
-max_execution_time = 600
-memory_limit = 512M
-open_basedir = /var/www/html:/tmp/:/etc/phpmyadmin/
-post_max_size = 512M
-upload_max_filesize = 512M
-
-[Session]
-session.cookie_httponly = 1
-session.hash_function = 1
-session.save_path = "/sessions"
-session.use_strict_mode = 1
-
-[opcache]
-opcache.fast_shutdown = 1
-opcache.restrict_api = /disabled/
-opcache.save_comments = 0
-opcache.use_cwd = 0
-opcache.validate_timestamps = 0

run.sh

@@ -1,50 +1,22 @@
 #!/bin/sh
-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
+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
-
-    if [ ! -f /etc/phpmyadmin/config.user.inc.php ]; then
-        touch /etc/phpmyadmin/config.user.inc.php
-    fi
 fi
 
-exec "$@"
+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

testing/Dockerfile

@@ -6,5 +6,5 @@ FROM phpmyadmin/phpmyadmin
 RUN apk add --no-cache curl py2-pip
 RUN pip install mechanize html5lib
 
-COPY test.ini /etc/supervisor.d/
+COPY test-mariadb.ini test-mysql.ini /etc/supervisor.d/
 COPY phpmyadmin_test.py test-docker.sh world.sql /

testing/phpmyadmin_test.py

@@ -15,9 +15,7 @@ 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'
-        elif os.path.exists('./world.sql'):
+        if os.path.exists('./world.sql'):
             sqlfile = './world.sql'
         else:
             sqlfile = './testing/world.sql'

testing/test-docker.sh

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

testing/test-mysql.ini

@@ -1,5 +1,5 @@
 [program:test-mysql]
-command=/test-docker.sh test 80 db_server
+command=/test-docker.sh test 80 mysql
 autostart=true
 autorestart=false
 priority=3

testing/testing.cnf

@@ -1,2 +0,0 @@
-[mysqld]
-default_authentication_plugin = mysql_native_password

testing/wait-for-testing.sh

@@ -11,7 +11,7 @@ TIMEOUT=0
 
 sleep 5
 
-while [ `docker-compose -f docker-compose.testing.yml logs phpmyadmin | grep -c 'Result of db_server tests'` -lt 1 ] ; do
+while [ `docker-compose -f docker-compose.testing.yml logs phpmyadmin | grep -c 'Result of \(mysql\|mariadb\) tests'` -lt 2 ] ; do
     sleep 1
     TIMEOUT=$(($TIMEOUT + 1))
     if [ $TIMEOUT -gt 20 ] ; then
@@ -21,7 +21,7 @@ while [ `docker-compose -f docker-compose.testing.yml logs phpmyadmin | grep -c
     fi
 done
 
-if [ `docker-compose -f docker-compose.testing.yml logs phpmyadmin | grep -c 'Result of db_server tests.*SUCCESS'` -lt 1 ] ; then
+if [ `docker-compose -f docker-compose.testing.yml logs phpmyadmin | grep -c 'Result of \(mysql\|mariadb\) tests.*SUCCESS'` -lt 2 ] ; then
     docker-compose -f docker-compose.testing.yml logs phpmyadmin
     echo "${RED}Failed${NC}"
     exit 2