Fix snapshots download url

Issue #157

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

.travis.yml

@@ -12,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

@@ -28,47 +28,37 @@ RUN set -ex; \
     apk add --virtual .phpmyadmin-phpexts-rundeps $runDeps; \
     apk del .build-deps
 
+# 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.8.4
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ENV VERSION 4.8+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 -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; \
+    curl --output phpMyAdmin.tar.gz --location $URL; \
+    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
-    mkdir /sessions; \
-    mkdir -p /var/nginx/client_body_temp; \
-    apk del .fetch-deps
-
-# 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 mkdir /sessions \
+    && mkdir -p /www/tmp \
+    && chmod -R 777 /www/tmp
 
 # We expose phpMyAdmin on port 80
 EXPOSE 80
 
 ENTRYPOINT [ "/run.sh" ]
-CMD ["supervisord", "-n", "-j", "/supervisord.pid"]
+CMD ["phpmyadmin"]

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)(/.+)$;

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,8 +11,6 @@ $vars = array(
     'PMA_VERBOSES',
     'PMA_PORT',
     'PMA_PORTS',
-    'PMA_SOCKET',
-    'PMA_SOCKETS',
     'PMA_USER',
     'PMA_PASSWORD',
     'PMA_ABSOLUTE_URI',
@@ -54,14 +52,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 */
@@ -101,6 +94,8 @@ for ($i = 1; isset($hosts[$i - 1]); $i++) {
       $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
       $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
       $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
+      $cfg['Servers'][$i]['compress'] = false;
+      $cfg['Servers'][$i]['AllowNoPassword'] = true;
     }
     if (isset($_ENV['PMA_CONTROLHOST'])) {
       $cfg['Servers'][$i]['controlhost'] = $_ENV['PMA_CONTROLHOST'];
@@ -114,12 +109,6 @@ for ($i = 1; isset($hosts[$i - 1]); $i++) {
     if (isset($_ENV['PMA_CONTROLPASS'])) {
       $cfg['Servers'][$i]['controlpass'] = $_ENV['PMA_CONTROLPASS'];
     }
-    $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

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-fpm --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/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