Configure to use snapshot builds for 4.9 series

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

.dockerignore

@@ -1,7 +0,0 @@
-.travis.yml
-docker-compose.yml
-docker-compose.testing.yml
-README.md
-LICENSE
-Makefile
-testing

Dockerfile-alpine.template

@@ -29,36 +29,21 @@ RUN set -ex; \
     apk del .build-deps
 
 # Calculate download URL
-ENV VERSION 4.8.5
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ENV VERSION 4.9+snapshot
+ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.xz
 LABEL version=$VERSION
 
-# Download tarball, verify it using gpg and extract
+# Download tarball 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; \
+    rm -r phpMyAdmin.tar.xz; \
     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
+    mkdir -p /var/nginx/client_body_temp
 
 # Copy configuration
 COPY config.inc.php /etc/phpmyadmin/config.inc.php

Dockerfile-debian.template

@@ -32,41 +32,21 @@ RUN set -ex; \
 	rm -rf /var/lib/apt/lists/*
 
 # Calculate download URL
-ENV VERSION 4.8.5
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ENV VERSION 4.9+snapshot
+ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.xz
 LABEL version=$VERSION
 
-# Download tarball, verify it using gpg and extract
+# Download tarball and extract
 RUN set -ex; \
-    fetchDeps=" \
-        gnupg \
-        dirmngr \
-    "; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends $fetchDeps; \
-    \
-    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; \
+    rm -r phpMyAdmin.tar.xz; \
     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; \
-    \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
-    rm -rf /var/lib/apt/lists/*
+    mkdir -p /var/nginx/client_body_temp
 
 # Copy configuration
 COPY config.inc.php /etc/phpmyadmin/config.inc.php

apache/Dockerfile

@@ -32,41 +32,21 @@ RUN set -ex; \
 	rm -rf /var/lib/apt/lists/*
 
 # Calculate download URL
-ENV VERSION 4.8.5
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ENV VERSION 4.9+snapshot
+ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.xz
 LABEL version=$VERSION
 
-# Download tarball, verify it using gpg and extract
+# Download tarball and extract
 RUN set -ex; \
-    fetchDeps=" \
-        gnupg \
-        dirmngr \
-    "; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends $fetchDeps; \
-    \
-    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; \
+    rm -r phpMyAdmin.tar.xz; \
     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; \
-    \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
-    rm -rf /var/lib/apt/lists/*
+    mkdir -p /var/nginx/client_body_temp
 
 # Copy configuration
 COPY config.inc.php /etc/phpmyadmin/config.inc.php

apache/etc/etc/nginx.conf

@@ -1,131 +0,0 @@
-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 /var/www/html;
-
-        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 127.0.0.1:9000;
-
-            # 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 1200;
-            fastcgi_buffering off;
-            fastcgi_buffers 16 16k;
-            fastcgi_buffer_size 32k;
-
-            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;
-        }
-
-    }
-}

apache/etc/etc/php-fpm.conf

@@ -1,15 +0,0 @@
-[global]
-error_log = /var/log/php-fpm.log
-log_level = warning
-
-[www]
-listen = /var/run/php/php-fpm.sock
-listen.mode = 0660
-chdir = /var/www/html
-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

apache/etc/etc/phpmyadmin/config.inc.php

@@ -1,137 +0,0 @@
-<?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_PORTS',
-    'PMA_SOCKET',
-    'PMA_SOCKETS',
-    'PMA_USER',
-    'PMA_PASSWORD',
-    'PMA_ABSOLUTE_URI',
-    'PMA_CONTROLHOST',
-    'PMA_CONTROLPORT',
-    'PMA_PMADB',
-    'PMA_CONTROLUSER',
-    'PMA_CONTROLPASS',
-    'PMA_QUERYHISTORYDB'
-);
-foreach ($vars as $var) {
-    $env = getenv($var);
-    if (!isset($_ENV[$var]) && $env !== false) {
-        $_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') {
-    $cfg['AllowArbitraryServer'] = true;
-}
-
-/* Play nice behind reverse proxys */
-if (isset($_ENV['PMA_ABSOLUTE_URI'])) {
-    $cfg['PmaAbsoluteUri'] = trim($_ENV['PMA_ABSOLUTE_URI']);
-}
-
-/* Figure out hosts */
-
-/* Fallback to default linked */
-$hosts = array('db');
-
-/* Set by environment */
-if (!empty($_ENV['PMA_HOST'])) {
-    $hosts = array($_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']);
-}
-
-/* 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($ports[$i - 1])) {
-        $cfg['Servers'][$i]['port'] = $ports[$i - 1];
-    }
-    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'] : '';
-    } 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]['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'] = '';
-$cfg['SaveDir'] = '';
-
-/* Include User Defined Settings Hook */
-if (file_exists('/etc/phpmyadmin/config.user.inc.php')) {
-    include('/etc/phpmyadmin/config.user.inc.php');
-}

apache/etc/etc/supervisor.d/nginx.ini

@@ -1,12 +0,0 @@
-[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
-

apache/etc/etc/supervisor.d/php.ini

@@ -1,12 +0,0 @@
-[program:php-fpm]
-command=php-fpm --nodaemonize --fpm-config /usr/local/etc/php-fpm.conf
-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
-

apache/etc/nginx.conf

@@ -1,132 +0,0 @@
-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 1200;
-            fastcgi_buffering off;
-            fastcgi_buffers 16 16k;
-            fastcgi_buffer_size 32k;
-
-            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;
-        }
-
-    }
-}

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

apache/etc/phpmyadmin/config.inc.php

@@ -1,126 +0,0 @@
-<?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_PORTS',
-    'PMA_USER',
-    'PMA_PASSWORD',
-    'PMA_ABSOLUTE_URI',
-    'PMA_CONTROLHOST',
-    'PMA_CONTROLPORT',
-    'PMA_PMADB',
-    'PMA_CONTROLUSER',
-    'PMA_CONTROLPASS',
-    'PMA_QUERYHISTORYDB'
-);
-foreach ($vars as $var) {
-    $env = getenv($var);
-    if (!isset($_ENV[$var]) && $env !== false) {
-        $_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') {
-    $cfg['AllowArbitraryServer'] = true;
-}
-
-/* Play nice behind reverse proxys */
-if (isset($_ENV['PMA_ABSOLUTE_URI'])) {
-    $cfg['PmaAbsoluteUri'] = trim($_ENV['PMA_ABSOLUTE_URI']);
-}
-
-/* Figure out hosts */
-
-/* Fallback to default linked */
-$hosts = array('db');
-
-/* Set by environment */
-if (!empty($_ENV['PMA_HOST'])) {
-    $hosts = array($_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']);
-}
-
-/* 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($ports[$i - 1])) {
-        $cfg['Servers'][$i]['port'] = $ports[$i - 1];
-    }
-    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'] : '';
-    } 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]['compress'] = false;
-    $cfg['Servers'][$i]['AllowNoPassword'] = true;
-}
-/*
- * Revert back to last configured server to make
- * it easier in config.user.inc.php
- */
-$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');
-}

apache/etc/supervisor.d/nginx.ini

@@ -1,12 +0,0 @@
-[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
-

apache/etc/supervisor.d/php.ini

@@ -1,13 +0,0 @@
-[program:php-fpm]
-command=php-fpm --nodaemonize --fpm-config /etc/php-fpm.conf
-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
-

apache/run.sh

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

fpm-alpine/Dockerfile

@@ -29,36 +29,21 @@ RUN set -ex; \
     apk del .build-deps
 
 # Calculate download URL
-ENV VERSION 4.8.5
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ENV VERSION 4.9+snapshot
+ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.xz
 LABEL version=$VERSION
 
-# Download tarball, verify it using gpg and extract
+# Download tarball 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; \
+    rm -r phpMyAdmin.tar.xz; \
     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
+    mkdir -p /var/nginx/client_body_temp
 
 # Copy configuration
 COPY config.inc.php /etc/phpmyadmin/config.inc.php

fpm-alpine/etc/etc/nginx.conf

@@ -1,131 +0,0 @@
-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 /var/www/html;
-
-        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 127.0.0.1:9000;
-
-            # 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 1200;
-            fastcgi_buffering off;
-            fastcgi_buffers 16 16k;
-            fastcgi_buffer_size 32k;
-
-            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;
-        }
-
-    }
-}

fpm-alpine/etc/etc/php-fpm.conf

@@ -1,15 +0,0 @@
-[global]
-error_log = /var/log/php-fpm.log
-log_level = warning
-
-[www]
-listen = /var/run/php/php-fpm.sock
-listen.mode = 0660
-chdir = /var/www/html
-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

fpm-alpine/etc/etc/phpmyadmin/config.inc.php

@@ -1,137 +0,0 @@
-<?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_PORTS',
-    'PMA_SOCKET',
-    'PMA_SOCKETS',
-    'PMA_USER',
-    'PMA_PASSWORD',
-    'PMA_ABSOLUTE_URI',
-    'PMA_CONTROLHOST',
-    'PMA_CONTROLPORT',
-    'PMA_PMADB',
-    'PMA_CONTROLUSER',
-    'PMA_CONTROLPASS',
-    'PMA_QUERYHISTORYDB'
-);
-foreach ($vars as $var) {
-    $env = getenv($var);
-    if (!isset($_ENV[$var]) && $env !== false) {
-        $_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') {
-    $cfg['AllowArbitraryServer'] = true;
-}
-
-/* Play nice behind reverse proxys */
-if (isset($_ENV['PMA_ABSOLUTE_URI'])) {
-    $cfg['PmaAbsoluteUri'] = trim($_ENV['PMA_ABSOLUTE_URI']);
-}
-
-/* Figure out hosts */
-
-/* Fallback to default linked */
-$hosts = array('db');
-
-/* Set by environment */
-if (!empty($_ENV['PMA_HOST'])) {
-    $hosts = array($_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']);
-}
-
-/* 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($ports[$i - 1])) {
-        $cfg['Servers'][$i]['port'] = $ports[$i - 1];
-    }
-    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'] : '';
-    } 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]['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'] = '';
-$cfg['SaveDir'] = '';
-
-/* Include User Defined Settings Hook */
-if (file_exists('/etc/phpmyadmin/config.user.inc.php')) {
-    include('/etc/phpmyadmin/config.user.inc.php');
-}

fpm-alpine/etc/etc/supervisor.d/nginx.ini

@@ -1,12 +0,0 @@
-[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
-

fpm-alpine/etc/etc/supervisor.d/php.ini

@@ -1,12 +0,0 @@
-[program:php-fpm]
-command=php-fpm --nodaemonize --fpm-config /usr/local/etc/php-fpm.conf
-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
-

fpm-alpine/etc/nginx.conf

@@ -1,132 +0,0 @@
-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 1200;
-            fastcgi_buffering off;
-            fastcgi_buffers 16 16k;
-            fastcgi_buffer_size 32k;
-
-            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;
-        }
-
-    }
-}

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

fpm-alpine/etc/phpmyadmin/config.inc.php

@@ -1,126 +0,0 @@
-<?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_PORTS',
-    'PMA_USER',
-    'PMA_PASSWORD',
-    'PMA_ABSOLUTE_URI',
-    'PMA_CONTROLHOST',
-    'PMA_CONTROLPORT',
-    'PMA_PMADB',
-    'PMA_CONTROLUSER',
-    'PMA_CONTROLPASS',
-    'PMA_QUERYHISTORYDB'
-);
-foreach ($vars as $var) {
-    $env = getenv($var);
-    if (!isset($_ENV[$var]) && $env !== false) {
-        $_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') {
-    $cfg['AllowArbitraryServer'] = true;
-}
-
-/* Play nice behind reverse proxys */
-if (isset($_ENV['PMA_ABSOLUTE_URI'])) {
-    $cfg['PmaAbsoluteUri'] = trim($_ENV['PMA_ABSOLUTE_URI']);
-}
-
-/* Figure out hosts */
-
-/* Fallback to default linked */
-$hosts = array('db');
-
-/* Set by environment */
-if (!empty($_ENV['PMA_HOST'])) {
-    $hosts = array($_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']);
-}
-
-/* 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($ports[$i - 1])) {
-        $cfg['Servers'][$i]['port'] = $ports[$i - 1];
-    }
-    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'] : '';
-    } 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]['compress'] = false;
-    $cfg['Servers'][$i]['AllowNoPassword'] = true;
-}
-/*
- * Revert back to last configured server to make
- * it easier in config.user.inc.php
- */
-$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');
-}

fpm-alpine/etc/supervisor.d/nginx.ini

@@ -1,12 +0,0 @@
-[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
-

fpm-alpine/etc/supervisor.d/php.ini

@@ -1,13 +0,0 @@
-[program:php-fpm]
-command=php-fpm --nodaemonize --fpm-config /etc/php-fpm.conf
-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
-

fpm-alpine/run.sh

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

fpm/Dockerfile

@@ -32,41 +32,21 @@ RUN set -ex; \
 	rm -rf /var/lib/apt/lists/*
 
 # Calculate download URL
-ENV VERSION 4.8.5
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
+ENV VERSION 4.9+snapshot
+ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.xz
 LABEL version=$VERSION
 
-# Download tarball, verify it using gpg and extract
+# Download tarball and extract
 RUN set -ex; \
-    fetchDeps=" \
-        gnupg \
-        dirmngr \
-    "; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends $fetchDeps; \
-    \
-    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; \
+    rm -r phpMyAdmin.tar.xz; \
     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; \
-    \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
-    rm -rf /var/lib/apt/lists/*
+    mkdir -p /var/nginx/client_body_temp
 
 # Copy configuration
 COPY config.inc.php /etc/phpmyadmin/config.inc.php

fpm/etc/etc/nginx.conf

@@ -1,131 +0,0 @@
-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 /var/www/html;
-
-        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 127.0.0.1:9000;
-
-            # 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 1200;
-            fastcgi_buffering off;
-            fastcgi_buffers 16 16k;
-            fastcgi_buffer_size 32k;
-
-            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;
-        }
-
-    }
-}

fpm/etc/etc/php-fpm.conf

@@ -1,15 +0,0 @@
-[global]
-error_log = /var/log/php-fpm.log
-log_level = warning
-
-[www]
-listen = /var/run/php/php-fpm.sock
-listen.mode = 0660
-chdir = /var/www/html
-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

fpm/etc/etc/phpmyadmin/config.inc.php

@@ -1,137 +0,0 @@
-<?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_PORTS',
-    'PMA_SOCKET',
-    'PMA_SOCKETS',
-    'PMA_USER',
-    'PMA_PASSWORD',
-    'PMA_ABSOLUTE_URI',
-    'PMA_CONTROLHOST',
-    'PMA_CONTROLPORT',
-    'PMA_PMADB',
-    'PMA_CONTROLUSER',
-    'PMA_CONTROLPASS',
-    'PMA_QUERYHISTORYDB'
-);
-foreach ($vars as $var) {
-    $env = getenv($var);
-    if (!isset($_ENV[$var]) && $env !== false) {
-        $_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') {
-    $cfg['AllowArbitraryServer'] = true;
-}
-
-/* Play nice behind reverse proxys */
-if (isset($_ENV['PMA_ABSOLUTE_URI'])) {
-    $cfg['PmaAbsoluteUri'] = trim($_ENV['PMA_ABSOLUTE_URI']);
-}
-
-/* Figure out hosts */
-
-/* Fallback to default linked */
-$hosts = array('db');
-
-/* Set by environment */
-if (!empty($_ENV['PMA_HOST'])) {
-    $hosts = array($_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']);
-}
-
-/* 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($ports[$i - 1])) {
-        $cfg['Servers'][$i]['port'] = $ports[$i - 1];
-    }
-    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'] : '';
-    } 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]['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'] = '';
-$cfg['SaveDir'] = '';
-
-/* Include User Defined Settings Hook */
-if (file_exists('/etc/phpmyadmin/config.user.inc.php')) {
-    include('/etc/phpmyadmin/config.user.inc.php');
-}

fpm/etc/etc/supervisor.d/nginx.ini

@@ -1,12 +0,0 @@
-[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
-

fpm/etc/etc/supervisor.d/php.ini

@@ -1,12 +0,0 @@
-[program:php-fpm]
-command=php-fpm --nodaemonize --fpm-config /usr/local/etc/php-fpm.conf
-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
-

fpm/etc/nginx.conf

@@ -1,132 +0,0 @@
-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 1200;
-            fastcgi_buffering off;
-            fastcgi_buffers 16 16k;
-            fastcgi_buffer_size 32k;
-
-            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;
-        }
-
-    }
-}

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

fpm/etc/phpmyadmin/config.inc.php

@@ -1,126 +0,0 @@
-<?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_PORTS',
-    'PMA_USER',
-    'PMA_PASSWORD',
-    'PMA_ABSOLUTE_URI',
-    'PMA_CONTROLHOST',
-    'PMA_CONTROLPORT',
-    'PMA_PMADB',
-    'PMA_CONTROLUSER',
-    'PMA_CONTROLPASS',
-    'PMA_QUERYHISTORYDB'
-);
-foreach ($vars as $var) {
-    $env = getenv($var);
-    if (!isset($_ENV[$var]) && $env !== false) {
-        $_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') {
-    $cfg['AllowArbitraryServer'] = true;
-}
-
-/* Play nice behind reverse proxys */
-if (isset($_ENV['PMA_ABSOLUTE_URI'])) {
-    $cfg['PmaAbsoluteUri'] = trim($_ENV['PMA_ABSOLUTE_URI']);
-}
-
-/* Figure out hosts */
-
-/* Fallback to default linked */
-$hosts = array('db');
-
-/* Set by environment */
-if (!empty($_ENV['PMA_HOST'])) {
-    $hosts = array($_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']);
-}
-
-/* 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($ports[$i - 1])) {
-        $cfg['Servers'][$i]['port'] = $ports[$i - 1];
-    }
-    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'] : '';
-    } 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]['compress'] = false;
-    $cfg['Servers'][$i]['AllowNoPassword'] = true;
-}
-/*
- * Revert back to last configured server to make
- * it easier in config.user.inc.php
- */
-$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');
-}

fpm/etc/supervisor.d/nginx.ini

@@ -1,12 +0,0 @@
-[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
-

fpm/etc/supervisor.d/php.ini

@@ -1,13 +0,0 @@
-[program:php-fpm]
-command=php-fpm --nodaemonize --fpm-config /etc/php-fpm.conf
-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
-

fpm/run.sh

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