Configure to use snapshot builds for 4.9 series

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
Remove GPG verification of downloads, since we don't sign snapshot
2026-08-24 18:14:23 -05:00 · 2019-06-08 13:56:12 -04:00 · 2019-06-08 13:54:17 -04:00 · 2019-06-05 22:24:05 -04:00
27 changed files with 475 additions and 955 deletions
@@ -1 +0,0 @@
-*.sql linguist-detectable=false
@@ -1,6 +1 @@
 config.secret.inc.php
-__pycache__
-.pytest_cache
-.vscode
-.history
-.venv
@@ -2,89 +2,41 @@ services:
  - docker

 language: python
-python: 2.7
-dist: bionic
+python:
+  - "2.7"

-stages:
-  - name: "Build images"
-  - name: "Test docker-compose"
-  - name: "Run tests in testing container"
+env:
+  matrix:
+    - DB=mysql:latest
+    - 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

 install:
-  - pip install mechanize html5lib pytest
+  - pip install mechanize html5lib

-_helpers:
- &test-docker-compose
-  stage: "Test docker-compose"
-  script:
-    - docker-compose -f docker-compose.testing.yml up -d db_server
-    - docker-compose -f docker-compose.testing.yml up -d
-    - docker-compose exec phpmyadmin /test-docker.sh phpmyadmin_testing 80 phpmyadmin_testing_db
-    - docker-compose stop
- &test-apache-image
-  stage: "Run tests in testing container"
-  script:
-    # Build image
-    - docker build -t phpmyadmin apache
-    # Test for single database
-    - docker run --name testadmin -d --link db_server:db -p 9090:80 phpmyadmin
-    - ./testing/test-docker.sh testadmin 9090
-    # Test for single database using env
-    - docker run --name envadmin -d --link db_server:db2 -e PMA_HOST=db2 -p 6060:80 phpmyadmin
-    - ./testing/test-docker.sh envadmin 6060
-    # Test for arbitrary database
-    - docker run --name arbitraryadmin -d --link db_server:db3 -e PMA_ARBITRARY=1 -p 7070:80 phpmyadmin
-    - ./testing/test-docker.sh arbitraryadmin 7070 db3
-    # Test for arbitrary database with user config
-    - docker run --name userconfigadmin -d --link db_server:db3 -v `readlink -f ./testing/config.test.inc.php`:/etc/phpmyadmin/config.user.inc.php -p 7080:80 phpmyadmin
-    - ./testing/test-docker.sh userconfigadmin 7080 db3
- &test-docker-compose-db
-  stage: "Test docker-compose"
-  script:
-    - docker-compose -f docker-compose.yml -f docker-compose.db.yml up -d
-    - ./testing/test-docker.sh phpmyadmin 8080 db_server
-    - docker-compose stop
- &build-image
-  stage: "Build images"
-  before_install: skip
-  install: skip
-
-jobs:
-  include:
-    - <<: *test-docker-compose
-      name: "Run and stop container using testing docker-compose file for MariaDB"
-      env: DB=mariadb:latest
-    - <<: *test-docker-compose
-      name: "Run and stop container using testing docker-compose file for MySQL"
-      env: DB=mysql:latest
-    - <<: *test-docker-compose-db
-      name: "Run and stop container using db docker-compose file for MariaDB"
-      env: DB=mariadb:latest
-    - <<: *test-docker-compose-db
-      name: "Run and stop container using db docker-compose file for MySQL"
-      env: DB=mysql:latest
-    - <<: *build-image
-      name: "Apache amd64"
-      arch: amd64
-      script:
-      - docker build -t phpmyadmin apache
-    - <<: *build-image
-      name: "fpm amd64"
-      arch: amd64
-      script:
-      - docker build -t phpmyadmin fpm
-    - <<: *build-image
-      name: "fpm-alpine amd64"
-      arch: amd64
-      script:
-      - docker build -t phpmyadmin fpm-alpine
-    - <<: *test-apache-image
-      name: "Run testing for MariaDB"
-      env: DB=mariadb:latest
-    - <<: *test-apache-image
-      name: "Run testing for MySQL"
-      env: DB=mysql:latest
+script:
+  # Build image
+  - docker build -t phpmyadmin/phpmyadmin apache
+  # Test for single database
+  - docker run --name testadmin -d --link db_server:db -p 9090:80 phpmyadmin/phpmyadmin
+  - ./testing/test-docker.sh testadmin 9090
+  # Test for single database using env
+  - docker run --name envadmin -d --link db_server:db2 -e PMA_HOST=db2 -p 6060:80 phpmyadmin/phpmyadmin
+  - ./testing/test-docker.sh envadmin 6060
+  # Test for arbitrary database
+  - docker run --name arbitraryadmin -d --link db_server:db3 -e PMA_ARBITRARY=1 -p 7070:80 phpmyadmin/phpmyadmin
+  - ./testing/test-docker.sh arbitraryadmin 7070 db3
+  # Test for arbitrary database with user config
+  - docker run --name userconfigadmin -d --link db_server:db3 -v `readlink -f ./testing/config.test.inc.php`:/etc/phpmyadmin/config.user.inc.php -p 7080:80 phpmyadmin/phpmyadmin
+  - ./testing/test-docker.sh userconfigadmin 7080 db3
+  # Test docker-compose
+  - docker-compose -f docker-compose.yml -f docker-compose.db.yml up -d
+  - ./testing/test-docker.sh phpmyadmin 8080 db_server
+  - docker-compose stop
+  # Run tests in testing container
+  - docker-compose -f docker-compose.testing.yml up -d db_server
+  - docker-compose -f docker-compose.testing.yml up -d
+  - docker-compose exec phpmyadmin /test-docker.sh phpmyadmin_testing 80 phpmyadmin_testing_db
@@ -1,9 +1,8 @@
-FROM php:7.4-%%VARIANT%%
+FROM php:7.2-%%VARIANT%%

 # docker-entrypoint.sh dependencies
 RUN apk add --no-cache \
-    bash \
-    tzdata
+	bash

 # Install dependencies
 RUN set -ex; \
@@ -15,17 +14,10 @@ RUN set -ex; \
        libpng-dev \
        libwebp-dev \
        libxpm-dev \
-        libzip-dev \
    ; \
    \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
-    docker-php-ext-install -j "$(nproc)" \
-        bz2 \
-        gd \
-        mysqli \
-        opcache \
-        zip \
-    ; \
+    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 \
@@ -34,74 +26,28 @@ RUN set -ex; \
            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
    )"; \
    apk add --virtual .phpmyadmin-phpexts-rundeps $runDeps; \
-    apk del --no-network .build-deps
-
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN set -ex; \
-    \
-    { \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=4000'; \
-        echo 'opcache.revalidate_freq=2'; \
-        echo 'opcache.fast_shutdown=1'; \
-    } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \
-    \
-    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > $PHP_INI_DIR/conf.d/session-strict.ini; \
-    \
-    { \
-        echo 'allow_url_fopen = Off'; \
-        echo 'max_execution_time = 600'; \
-        echo 'memory_limit = 512M'; \
-    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
+    apk del .build-deps

 # Calculate download URL
-ENV VERSION %%VERSION%%
-ENV SHA256 %%SHA256%%
-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

-LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
-    org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
-    org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
-    org.opencontainers.image.vendor="phpMyAdmin" \
-    org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
-    org.opencontainers.image.licenses="GPL-2.0-only" \
-    org.opencontainers.image.version="${VERSION}" \
-    org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
-    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
-
-# 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 -fsSL -o phpMyAdmin.tar.xz $URL; \
-    curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \
-    echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \
-    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 /var/www/html --strip-components=1; \
-    mkdir -p /var/www/html/tmp; \
-    chown www-data:www-data /var/www/html/tmp; \
-    gpgconf --kill all; \
-    rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
-    rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \
-    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
-    apk del --no-network .fetch-deps
+    curl --output phpMyAdmin.tar.xz --location $URL; \
+    tar -xf phpMyAdmin.tar.xz -C /usr/src; \
+    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

 # Copy configuration
 COPY config.inc.php /etc/phpmyadmin/config.inc.php
+COPY php.ini /usr/local/etc/php/conf.d/php-phpmyadmin.ini

 # Copy main script
 COPY docker-entrypoint.sh /docker-entrypoint.sh
@@ -1,118 +1,56 @@
-FROM php:7.4-%%VARIANT%%
+FROM php:7.2-%%VARIANT%%

 # Install dependencies
 RUN set -ex; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        libbz2-dev \
-        libfreetype6-dev \
-        libjpeg-dev \
-        libpng-dev \
-        libwebp-dev \
-        libxpm-dev \
-        libzip-dev \
-    ; \
-    \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
-    docker-php-ext-install -j "$(nproc)" \
-        bz2 \
-        gd \
-        mysqli \
-        opcache \
-        zip \
-    ; \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
-        | sort -u \
-        | xargs -r dpkg-query -S \
-        | cut -d: -f1 \
-        | sort -u \
-        | xargs -rt apt-mark manual; \
-    \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
-
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN set -ex; \
-    \
-    { \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=4000'; \
-        echo 'opcache.revalidate_freq=2'; \
-        echo 'opcache.fast_shutdown=1'; \
-    } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \
-    \
-    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > $PHP_INI_DIR/conf.d/session-strict.ini; \
-    \
-    { \
-        echo 'allow_url_fopen = Off'; \
-        echo 'max_execution_time = 600'; \
-        echo 'memory_limit = 512M'; \
-    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
+	\
+	savedAptMark="$(apt-mark showmanual)"; \
+	\
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		libbz2-dev \
+		libfreetype6-dev \
+		libjpeg-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; \
+	\
+	apt-mark auto '.*' > /dev/null; \
+	apt-mark manual $savedAptMark; \
+	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+		| awk '/=>/ { print $3 }' \
+		| sort -u \
+		| xargs -r dpkg-query -S \
+		| cut -d: -f1 \
+		| sort -u \
+		| xargs -rt apt-mark manual; \
+	\
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*

 # Calculate download URL
-ENV VERSION %%VERSION%%
-ENV SHA256 %%SHA256%%
-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

-LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
-    org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
-    org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
-    org.opencontainers.image.vendor="phpMyAdmin" \
-    org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
-    org.opencontainers.image.licenses="GPL-2.0-only" \
-    org.opencontainers.image.version="${VERSION}" \
-    org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
-    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
-
-# Download tarball, verify it using gpg and extract
+# Download tarball and extract
 RUN set -ex; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        gnupg \
-        dirmngr \
-    ; \
-    \
-    export GNUPGHOME="$(mktemp -d)"; \
-    export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
-    curl -fsSL -o phpMyAdmin.tar.xz $URL; \
-    curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \
-    echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \
-    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 /var/www/html --strip-components=1; \
-    mkdir -p /var/www/html/tmp; \
-    chown www-data:www-data /var/www/html/tmp; \
-    gpgconf --kill all; \
-    rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
-    rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \
-    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
+    curl --output phpMyAdmin.tar.xz --location $URL; \
+    tar -xf phpMyAdmin.tar.xz -C /usr/src; \
+    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

 # Copy configuration
 COPY config.inc.php /etc/phpmyadmin/config.inc.php
+COPY php.ini /usr/local/etc/php/conf.d/php-phpmyadmin.ini

 # Copy main script
 COPY docker-entrypoint.sh /docker-entrypoint.sh
@@ -1,6 +1,6 @@
-DOCKER_REPO = phpmyadmin
+DOCKER_REPO = phpmyadmin/phpmyadmin

-.PHONY: all build run logs clean stop rm prune
+.PHONY: all build build_nc run logs clean stop rm prune

 all: build run logs

@@ -18,9 +18,6 @@ build-fpm-alpine:
 run:
 	docker-compose -f docker-compose.testing.yml up -d

-run-tests:
-	docker-compose exec phpmyadmin /test-docker.sh phpmyadmin_testing 80 phpmyadmin_testing_db
-
 logs:
 	docker-compose -f docker-compose.testing.yml logs

@@ -1,21 +1,12 @@
 # Official phpMyAdmin Docker image

-Run phpMyAdmin with Alpine, Apache and PHP FPM.
+Run phpMyAdmin with Alpine, supervisor, nginx and PHP FPM.

-[![Build Status Travis](https://travis-ci.org/phpmyadmin/docker.svg?branch=master)](https://travis-ci.org/phpmyadmin/docker)
-[![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/phpmyadmin.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/phpmyadmin)
-[![arm32v5 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/phpmyadmin.svg?label=arm32v5)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/phpmyadmin)
-[![arm32v6 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/phpmyadmin.svg?label=arm32v6)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/phpmyadmin)
-[![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/phpmyadmin.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/phpmyadmin)
-[![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/phpmyadmin.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/phpmyadmin)
-[![i386 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/i386/job/phpmyadmin.svg?label=i386)](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/phpmyadmin)
-[![mips64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/phpmyadmin.svg?label=mips64le)](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/phpmyadmin)
-[![ppc64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/phpmyadmin.svg?label=ppc64le)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/phpmyadmin)
-[![s390x build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/s390x/job/phpmyadmin.svg?label=s390x)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/phpmyadmin)
-[![Docker Pulls](https://img.shields.io/docker/pulls/_/phpmyadmin.svg)][hub]
-[![Docker Stars](https://img.shields.io/docker/stars/_/phpmyadmin.svg)][hub]
-[![Docker Layers](https://images.microbadger.com/badges/image/phpmyadmin.svg)](https://microbadger.com/images/phpmyadmin "Get your own image badge on microbadger.com")
-[![Docker Version](https://images.microbadger.com/badges/version/phpmyadmin.svg)](https://microbadger.com/images/phpmyadmin "Get your own version badge on microbadger.com")
+[![Build Status](https://travis-ci.org/phpmyadmin/docker.svg?branch=master)](https://travis-ci.org/phpmyadmin/docker)
+[![Docker Pulls](https://img.shields.io/docker/pulls/phpmyadmin/phpmyadmin.svg)][hub]
+[![Docker Stars](https://img.shields.io/docker/stars/phpmyadmin/phpmyadmin.svg)][hub]
+[![Docker Layers](https://images.microbadger.com/badges/image/phpmyadmin/phpmyadmin.svg)](https://microbadger.com/images/phpmyadmin/phpmyadmin "Get your own image badge on microbadger.com")
+[![Docker Version](https://images.microbadger.com/badges/version/phpmyadmin/phpmyadmin.svg)](https://microbadger.com/images/phpmyadmin/phpmyadmin "Get your own version badge on microbadger.com")


 All following examples will bring you phpMyAdmin on `http://localhost:8080`
@@ -31,27 +22,14 @@ The official MySQL and MariaDB use following environment variables to define the
 * `MYSQL_ROOT_PASSWORD` - This variable is mandatory and specifies the password that will be set for the `root` superuser account.
 * `MYSQL_USER`, `MYSQL_PASSWORD` - These variables are optional, used in conjunction to create a new user and to set that user's password.

-## Supported Docker hub tags
+## Docker hub tags

-The following tags are available:
+You can use following tags on Docker hub:

-* `latest`, `fpm`, and `fpm-alpine` are always the most recent released version
-* Major versions, such as `5`, `5-fpm`, and `5-fpm-alpine`
-* Specific minor versions, such as `5.0`, `5.0-fpm`, and `5-fpm-alpine`
-* Specific patch versions, such as `5.0.0`, `5.0.0-fpm`, and `5.0.0-alpine`
-
-A complete list of tags is [available at Docker Hub](https://hub.docker.com/_/phpmyadmin?tab=tags)
-
-## Image variants
-
-We provide three variations:
-
-* "apache" includes a full Apache webserver with PHP and includes everything needed to work out of the box.
-This is the default when only a version number is requested.
-* "fpm" only starts a PHP FPM container. Use this variant if you already have a seperate webserver.
-This includes more tools and is therefore a larger image than the "fpm-alpine" variation.
-* "fpm-alpine" has a very small footprint. It is based on Alpine Linux and only starts a PHP FPM process.
-Use this variant if you already have a seperate webserver. If you need more tools that are not available on Alpine Linux, use the fpm image instead.
+* `latest` - latest stable release
+* `4.8` - latest stable release for the 4.8 version
+* `edge` - bleeding edge docker image (contains stable phpMyAdmin, but the Docker image changes might not yet be fully tested)
+* `edge-4.8` - bleeding edge docker image + latest snapshots from 4.8 branch (currently master)

 ## Usage with linked server

@@ -59,7 +37,7 @@ First you need to run MySQL or MariaDB server in Docker, and this image need
 link a running mysql instance container:

 ```
-docker run --name myadmin -d --link mysql_db_server:db -p 8080:80 phpmyadmin
+docker run --name myadmin -d --link mysql_db_server:db -p 8080:80 phpmyadmin/phpmyadmin
 ```

 ## Usage with external server
@@ -68,7 +46,7 @@ You can specify MySQL host in the `PMA_HOST` environment variable. You can also
 use `PMA_PORT` to specify port of the server in case it's not the default one:

 ```
-docker run --name myadmin -d -e PMA_HOST=dbhost -p 8080:80 phpmyadmin
+docker run --name myadmin -d -e PMA_HOST=dbhost -p 8080:80 phpmyadmin/phpmyadmin
 ```

 ## Usage with arbitrary server
@@ -76,7 +54,7 @@ docker run --name myadmin -d -e PMA_HOST=dbhost -p 8080:80 phpmyadmin
 You can use arbitrary servers by adding ENV variable `PMA_ARBITRARY=1` to the startup command:

 ```
-docker run --name myadmin -d -e PMA_ARBITRARY=1 -p 8080:80 phpmyadmin
+docker run --name myadmin -d -e PMA_ARBITRARY=1 -p 8080:80 phpmyadmin/phpmyadmin
 ```

 ## Usage with docker-compose and arbitrary server
@@ -102,16 +80,16 @@ docker-compose -f docker-compose.testing.yml up phpmyadmin

 ## Adding Custom Configuration

-You can add your own custom config.inc.php settings (such as Configuration Storage setup)
- by creating a file named "config.user.inc.php" with the various user defined settings
+You can add your own custom config.inc.php settings (such as Configuration Storage setup) 
+by creating a file named "config.user.inc.php" with the various user defined settings
 in it, and then linking it into the container using:

 ```
 -v /some/local/directory/config.user.inc.php:/etc/phpmyadmin/config.user.inc.php
 ```
 On the "docker run" line like this:
-```
-docker run --name myadmin -d --link mysql_db_server:db -p 8080:80 -v /some/local/directory/config.user.inc.php:/etc/phpmyadmin/config.user.inc.php phpmyadmin
+``` 
+docker run --name myadmin -d --link mysql_db_server:db -p 8080:80 -v /some/local/directory/config.user.inc.php:/etc/phpmyadmin/config.user.inc.php phpmyadmin/phpmyadmin
 ```

 See the following links for config file information.
@@ -133,27 +111,9 @@ Set the variable ``PMA_ABSOLUTE_URI`` to the fully-qualified path (``https://pma
 * ``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
-* ``HIDE_PHP_VERSION`` - if defined, will hide the php version (`expose_php = Off`). Set to any value (such as HIDE_PHP_VERSION=true).
-* ``UPLOAD_LIMIT`` - if set, will override the default value for apache and php-fpm (format as `[0-9+](K,M,G)` default value is 2048K, this will change ``upload_max_filesize`` and ``post_max_size`` values)
-* ``PMA_CONFIG_BASE64`` - if set, will override the default config.inc.php with the base64 decoded contents of the variable
-* ``PMA_USER_CONFIG_BASE64`` - if set, will override the default config.user.inc.php with the base64 decoded contents of the variable
-
-For usage with Docker secrets, appending ``_FILE`` to the ``PMA_PASSWORD`` environment variable is allowed (it overrides ``PMA_PASSWORD`` if it is set):
-```
-docker run --name myadmin -d -e PMA_PASSWORD_FILE=/run/secrets/db_password.txt -p 8080:80 phpmyadmin
-```
-
-#### Variables that can be read from a file using ``_FILE``
- PMA_PASSWORD
- MYSQL_ROOT_PASSWORD
- MYSQL_PASSWORD
- PMA_HOSTS
- PMA_HOST

 For more detailed documentation see https://docs.phpmyadmin.net/en/latest/setup.html#installing-using-docker

-[hub]: https://hub.docker.com/_/phpmyadmin
+[hub]: https://hub.docker.com/r/phpmyadmin/phpmyadmin/

 Please report any issues with the Docker container to https://github.com/phpmyadmin/docker/issues
-
-Please report any issues with phpMyAdmin to https://github.com/phpmyadmin/phpmyadmin/issues
@@ -1,118 +1,56 @@
-FROM php:7.4-apache
+FROM php:7.2-apache

 # Install dependencies
 RUN set -ex; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        libbz2-dev \
-        libfreetype6-dev \
-        libjpeg-dev \
-        libpng-dev \
-        libwebp-dev \
-        libxpm-dev \
-        libzip-dev \
-    ; \
-    \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
-    docker-php-ext-install -j "$(nproc)" \
-        bz2 \
-        gd \
-        mysqli \
-        opcache \
-        zip \
-    ; \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
-        | sort -u \
-        | xargs -r dpkg-query -S \
-        | cut -d: -f1 \
-        | sort -u \
-        | xargs -rt apt-mark manual; \
-    \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
-
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN set -ex; \
-    \
-    { \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=4000'; \
-        echo 'opcache.revalidate_freq=2'; \
-        echo 'opcache.fast_shutdown=1'; \
-    } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \
-    \
-    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > $PHP_INI_DIR/conf.d/session-strict.ini; \
-    \
-    { \
-        echo 'allow_url_fopen = Off'; \
-        echo 'max_execution_time = 600'; \
-        echo 'memory_limit = 512M'; \
-    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
+	\
+	savedAptMark="$(apt-mark showmanual)"; \
+	\
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		libbz2-dev \
+		libfreetype6-dev \
+		libjpeg-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; \
+	\
+	apt-mark auto '.*' > /dev/null; \
+	apt-mark manual $savedAptMark; \
+	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+		| awk '/=>/ { print $3 }' \
+		| sort -u \
+		| xargs -r dpkg-query -S \
+		| cut -d: -f1 \
+		| sort -u \
+		| xargs -rt apt-mark manual; \
+	\
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*

 # Calculate download URL
-ENV VERSION 4.9.7
-ENV SHA256 294ae6f299d88eb83c99464fab2266cb18bd0fcb54bfd0384016af4961291fba
-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

-LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
-    org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
-    org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
-    org.opencontainers.image.vendor="phpMyAdmin" \
-    org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
-    org.opencontainers.image.licenses="GPL-2.0-only" \
-    org.opencontainers.image.version="${VERSION}" \
-    org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
-    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
-
-# Download tarball, verify it using gpg and extract
+# Download tarball and extract
 RUN set -ex; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        gnupg \
-        dirmngr \
-    ; \
-    \
-    export GNUPGHOME="$(mktemp -d)"; \
-    export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
-    curl -fsSL -o phpMyAdmin.tar.xz $URL; \
-    curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \
-    echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \
-    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 /var/www/html --strip-components=1; \
-    mkdir -p /var/www/html/tmp; \
-    chown www-data:www-data /var/www/html/tmp; \
-    gpgconf --kill all; \
-    rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
-    rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \
-    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
+    curl --output phpMyAdmin.tar.xz --location $URL; \
+    tar -xf phpMyAdmin.tar.xz -C /usr/src; \
+    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

 # Copy configuration
 COPY config.inc.php /etc/phpmyadmin/config.inc.php
+COPY php.ini /usr/local/etc/php/conf.d/php-phpmyadmin.ini

 # Copy main script
 COPY docker-entrypoint.sh /docker-entrypoint.sh
@@ -1,5 +1,39 @@
 #!/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
@@ -13,43 +47,4 @@ EOT
    fi
 fi

-if [ ! -z "${HIDE_PHP_VERSION}" ]; then
-    echo "PHP version is now hidden."
-    echo -e 'expose_php = Off\n' > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini
-fi
-
-UPLOAD_LIMIT_INI_FILE="$PHP_INI_DIR/conf.d/phpmyadmin-upload-limit.ini"
-if [ ! -z "${UPLOAD_LIMIT}" ]; then
-    echo "Adding the custom upload limit."
-    echo -e "upload_max_filesize = $UPLOAD_LIMIT\npost_max_size = $UPLOAD_LIMIT\n" > $UPLOAD_LIMIT_INI_FILE
-fi
-
-if [ ! -z "${PMA_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.inc.php from base64."
-    echo "${PMA_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.inc.php
-fi
-
-if [ ! -z "${PMA_USER_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.user.inc.php from base64."
-    echo "${PMA_USER_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.user.inc.php
-fi
-
-get_docker_secret() {
-    local env_var="${1}"
-    local env_var_file="${env_var}_FILE"
-
-    # Check if the variable with name $env_var_file (which is $PMA_PASSWORD_FILE for example)
-    # is not empty and export $PMA_PASSWORD as the password in the Docker secrets file
-
-    if [[ -n "${!env_var_file}" ]]; then
-        export "${env_var}"="$(cat "${!env_var_file}")"
-    fi
-}
-
-get_docker_secret PMA_PASSWORD
-get_docker_secret MYSQL_ROOT_PASSWORD
-get_docker_secret MYSQL_PASSWORD
-get_docker_secret PMA_HOSTS
-get_docker_secret PMA_HOST
-
 exec "$@"
@@ -0,0 +1,20 @@
+[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
@@ -1,30 +1,26 @@
-version: '3.1'
+version: '2'

 services:
  db_server:
-    image: ${DB:-mariadb:10.3}
+    image: ${DB}
    container_name: phpmyadmin_testing_db
    environment:
-      - MYSQL_ROOT_PASSWORD=${TESTSUITE_PASSWORD:-my-secret-pw}
+      - MYSQL_ROOT_PASSWORD=${TESTSUITE_PASSWORD}
    volumes:
      - ./testing/testing.cnf:/etc/mysql/conf.d/testing.cnf:ro
-    tmpfs: 
-      - /var/lib/mysql:rw,noexec,nosuid,size=300m

  phpmyadmin:
    build:
      context: testing/
+    links:
+      - db_server:db_server
    container_name: phpmyadmin_testing
    volumes:
      - /sessions
-      - ./testing/conftest.py:/conftest.py
-      - ./testing/test-docker.sh:/test-docker.sh
-      - ./testing/phpmyadmin_test.py:/phpmyadmin_test.py
-      - ./docker-entrypoint.sh:/docker-entrypoint.sh
    ports:
      - 8090:80
    environment:
      - PMA_ARBITRARY=1
-      - TESTSUITE_PASSWORD=${TESTSUITE_PASSWORD:-my-secret-pw}
+      - TESTSUITE_PASSWORD=${TESTSUITE_PASSWORD}
    depends_on:
      - db_server
@@ -1,5 +1,5 @@
 phpmyadmin:
-    image: phpmyadmin
+    image: phpmyadmin/phpmyadmin
    container_name: phpmyadmin
    environment:
     - PMA_ARBITRARY=1
@@ -1,5 +1,39 @@
 #!/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
@@ -13,43 +47,4 @@ EOT
    fi
 fi

-if [ ! -z "${HIDE_PHP_VERSION}" ]; then
-    echo "PHP version is now hidden."
-    echo -e 'expose_php = Off\n' > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini
-fi
-
-UPLOAD_LIMIT_INI_FILE="$PHP_INI_DIR/conf.d/phpmyadmin-upload-limit.ini"
-if [ ! -z "${UPLOAD_LIMIT}" ]; then
-    echo "Adding the custom upload limit."
-    echo -e "upload_max_filesize = $UPLOAD_LIMIT\npost_max_size = $UPLOAD_LIMIT\n" > $UPLOAD_LIMIT_INI_FILE
-fi
-
-if [ ! -z "${PMA_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.inc.php from base64."
-    echo "${PMA_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.inc.php
-fi
-
-if [ ! -z "${PMA_USER_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.user.inc.php from base64."
-    echo "${PMA_USER_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.user.inc.php
-fi
-
-get_docker_secret() {
-    local env_var="${1}"
-    local env_var_file="${env_var}_FILE"
-
-    # Check if the variable with name $env_var_file (which is $PMA_PASSWORD_FILE for example)
-    # is not empty and export $PMA_PASSWORD as the password in the Docker secrets file
-
-    if [[ -n "${!env_var_file}" ]]; then
-        export "${env_var}"="$(cat "${!env_var_file}")"
-    fi
-}
-
-get_docker_secret PMA_PASSWORD
-get_docker_secret MYSQL_ROOT_PASSWORD
-get_docker_secret MYSQL_PASSWORD
-get_docker_secret PMA_HOSTS
-get_docker_secret PMA_HOST
-
 exec "$@"
@@ -1,9 +1,8 @@
-FROM php:7.4-fpm-alpine
+FROM php:7.2-fpm-alpine

 # docker-entrypoint.sh dependencies
 RUN apk add --no-cache \
-    bash \
-    tzdata
+	bash

 # Install dependencies
 RUN set -ex; \
@@ -15,17 +14,10 @@ RUN set -ex; \
        libpng-dev \
        libwebp-dev \
        libxpm-dev \
-        libzip-dev \
    ; \
    \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
-    docker-php-ext-install -j "$(nproc)" \
-        bz2 \
-        gd \
-        mysqli \
-        opcache \
-        zip \
-    ; \
+    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 \
@@ -34,74 +26,28 @@ RUN set -ex; \
            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
    )"; \
    apk add --virtual .phpmyadmin-phpexts-rundeps $runDeps; \
-    apk del --no-network .build-deps
-
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN set -ex; \
-    \
-    { \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=4000'; \
-        echo 'opcache.revalidate_freq=2'; \
-        echo 'opcache.fast_shutdown=1'; \
-    } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \
-    \
-    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > $PHP_INI_DIR/conf.d/session-strict.ini; \
-    \
-    { \
-        echo 'allow_url_fopen = Off'; \
-        echo 'max_execution_time = 600'; \
-        echo 'memory_limit = 512M'; \
-    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
+    apk del .build-deps

 # Calculate download URL
-ENV VERSION 4.9.7
-ENV SHA256 294ae6f299d88eb83c99464fab2266cb18bd0fcb54bfd0384016af4961291fba
-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

-LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
-    org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
-    org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
-    org.opencontainers.image.vendor="phpMyAdmin" \
-    org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
-    org.opencontainers.image.licenses="GPL-2.0-only" \
-    org.opencontainers.image.version="${VERSION}" \
-    org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
-    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
-
-# 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 -fsSL -o phpMyAdmin.tar.xz $URL; \
-    curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \
-    echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \
-    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 /var/www/html --strip-components=1; \
-    mkdir -p /var/www/html/tmp; \
-    chown www-data:www-data /var/www/html/tmp; \
-    gpgconf --kill all; \
-    rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
-    rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \
-    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
-    apk del --no-network .fetch-deps
+    curl --output phpMyAdmin.tar.xz --location $URL; \
+    tar -xf phpMyAdmin.tar.xz -C /usr/src; \
+    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

 # Copy configuration
 COPY config.inc.php /etc/phpmyadmin/config.inc.php
+COPY php.ini /usr/local/etc/php/conf.d/php-phpmyadmin.ini

 # Copy main script
 COPY docker-entrypoint.sh /docker-entrypoint.sh
@@ -1,5 +1,39 @@
 #!/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
@@ -13,43 +47,4 @@ EOT
    fi
 fi

-if [ ! -z "${HIDE_PHP_VERSION}" ]; then
-    echo "PHP version is now hidden."
-    echo -e 'expose_php = Off\n' > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini
-fi
-
-UPLOAD_LIMIT_INI_FILE="$PHP_INI_DIR/conf.d/phpmyadmin-upload-limit.ini"
-if [ ! -z "${UPLOAD_LIMIT}" ]; then
-    echo "Adding the custom upload limit."
-    echo -e "upload_max_filesize = $UPLOAD_LIMIT\npost_max_size = $UPLOAD_LIMIT\n" > $UPLOAD_LIMIT_INI_FILE
-fi
-
-if [ ! -z "${PMA_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.inc.php from base64."
-    echo "${PMA_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.inc.php
-fi
-
-if [ ! -z "${PMA_USER_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.user.inc.php from base64."
-    echo "${PMA_USER_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.user.inc.php
-fi
-
-get_docker_secret() {
-    local env_var="${1}"
-    local env_var_file="${env_var}_FILE"
-
-    # Check if the variable with name $env_var_file (which is $PMA_PASSWORD_FILE for example)
-    # is not empty and export $PMA_PASSWORD as the password in the Docker secrets file
-
-    if [[ -n "${!env_var_file}" ]]; then
-        export "${env_var}"="$(cat "${!env_var_file}")"
-    fi
-}
-
-get_docker_secret PMA_PASSWORD
-get_docker_secret MYSQL_ROOT_PASSWORD
-get_docker_secret MYSQL_PASSWORD
-get_docker_secret PMA_HOSTS
-get_docker_secret PMA_HOST
-
 exec "$@"
@@ -0,0 +1,20 @@
+[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
@@ -1,118 +1,56 @@
-FROM php:7.4-fpm
+FROM php:7.2-fpm

 # Install dependencies
 RUN set -ex; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        libbz2-dev \
-        libfreetype6-dev \
-        libjpeg-dev \
-        libpng-dev \
-        libwebp-dev \
-        libxpm-dev \
-        libzip-dev \
-    ; \
-    \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
-    docker-php-ext-install -j "$(nproc)" \
-        bz2 \
-        gd \
-        mysqli \
-        opcache \
-        zip \
-    ; \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
-        | sort -u \
-        | xargs -r dpkg-query -S \
-        | cut -d: -f1 \
-        | sort -u \
-        | xargs -rt apt-mark manual; \
-    \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
-
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN set -ex; \
-    \
-    { \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=4000'; \
-        echo 'opcache.revalidate_freq=2'; \
-        echo 'opcache.fast_shutdown=1'; \
-    } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \
-    \
-    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > $PHP_INI_DIR/conf.d/session-strict.ini; \
-    \
-    { \
-        echo 'allow_url_fopen = Off'; \
-        echo 'max_execution_time = 600'; \
-        echo 'memory_limit = 512M'; \
-    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
+	\
+	savedAptMark="$(apt-mark showmanual)"; \
+	\
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		libbz2-dev \
+		libfreetype6-dev \
+		libjpeg-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; \
+	\
+	apt-mark auto '.*' > /dev/null; \
+	apt-mark manual $savedAptMark; \
+	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+		| awk '/=>/ { print $3 }' \
+		| sort -u \
+		| xargs -r dpkg-query -S \
+		| cut -d: -f1 \
+		| sort -u \
+		| xargs -rt apt-mark manual; \
+	\
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*

 # Calculate download URL
-ENV VERSION 4.9.7
-ENV SHA256 294ae6f299d88eb83c99464fab2266cb18bd0fcb54bfd0384016af4961291fba
-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

-LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
-    org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
-    org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
-    org.opencontainers.image.vendor="phpMyAdmin" \
-    org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
-    org.opencontainers.image.licenses="GPL-2.0-only" \
-    org.opencontainers.image.version="${VERSION}" \
-    org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
-    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
-
-# Download tarball, verify it using gpg and extract
+# Download tarball and extract
 RUN set -ex; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        gnupg \
-        dirmngr \
-    ; \
-    \
-    export GNUPGHOME="$(mktemp -d)"; \
-    export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
-    curl -fsSL -o phpMyAdmin.tar.xz $URL; \
-    curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \
-    echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \
-    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 /var/www/html --strip-components=1; \
-    mkdir -p /var/www/html/tmp; \
-    chown www-data:www-data /var/www/html/tmp; \
-    gpgconf --kill all; \
-    rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
-    rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \
-    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
+    curl --output phpMyAdmin.tar.xz --location $URL; \
+    tar -xf phpMyAdmin.tar.xz -C /usr/src; \
+    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

 # Copy configuration
 COPY config.inc.php /etc/phpmyadmin/config.inc.php
+COPY php.ini /usr/local/etc/php/conf.d/php-phpmyadmin.ini

 # Copy main script
 COPY docker-entrypoint.sh /docker-entrypoint.sh
@@ -1,5 +1,39 @@
 #!/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
@@ -13,43 +47,4 @@ EOT
    fi
 fi

-if [ ! -z "${HIDE_PHP_VERSION}" ]; then
-    echo "PHP version is now hidden."
-    echo -e 'expose_php = Off\n' > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini
-fi
-
-UPLOAD_LIMIT_INI_FILE="$PHP_INI_DIR/conf.d/phpmyadmin-upload-limit.ini"
-if [ ! -z "${UPLOAD_LIMIT}" ]; then
-    echo "Adding the custom upload limit."
-    echo -e "upload_max_filesize = $UPLOAD_LIMIT\npost_max_size = $UPLOAD_LIMIT\n" > $UPLOAD_LIMIT_INI_FILE
-fi
-
-if [ ! -z "${PMA_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.inc.php from base64."
-    echo "${PMA_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.inc.php
-fi
-
-if [ ! -z "${PMA_USER_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.user.inc.php from base64."
-    echo "${PMA_USER_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.user.inc.php
-fi
-
-get_docker_secret() {
-    local env_var="${1}"
-    local env_var_file="${env_var}_FILE"
-
-    # Check if the variable with name $env_var_file (which is $PMA_PASSWORD_FILE for example)
-    # is not empty and export $PMA_PASSWORD as the password in the Docker secrets file
-
-    if [[ -n "${!env_var_file}" ]]; then
-        export "${env_var}"="$(cat "${!env_var_file}")"
-    fi
-}
-
-get_docker_secret PMA_PASSWORD
-get_docker_secret MYSQL_ROOT_PASSWORD
-get_docker_secret MYSQL_PASSWORD
-get_docker_secret PMA_HOSTS
-get_docker_secret PMA_HOST
-
 exec "$@"
@@ -0,0 +1,20 @@
+[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
@@ -1,96 +0,0 @@
-#!/bin/bash
-set -e
-
-self="$(basename "$BASH_SOURCE")"
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-# Get the most recent commit which modified any of "$@".
-fileCommit() {
-	git log -1 --format='format:%H' HEAD -- "$@"
-}
-
-# Get the most recent commit which modified "$1/Dockerfile" or any file that
-# the Dockerfile copies into the rootfs (with COPY).
-dockerfileCommit() {
-	local dir="$1"; shift
-	(
-		cd "$dir";
-		fileCommit Dockerfile \
-			$(git show HEAD:./Dockerfile | awk '
-				toupper($1) == "COPY" {
-					for (i = 2; i < NF; i++)
-							print $i;
-				}
-			')
-	)
-}
-
-getArches() {
-	local repo="$1"; shift
-	local officialImagesUrl='https://github.com/docker-library/official-images/raw/master/library/'
-
-	eval "declare -g -A parentRepoToArches=( $(
-		find -name 'Dockerfile' -exec awk '
-				toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|microsoft\/[^:]+)(:|$)/ {
-					print "'"$officialImagesUrl"'" $2
-				}
-			' '{}' + \
-			| sort -u \
-			| xargs bashbrew cat --format '[{{ .RepoName }}:{{ .TagName }}]="{{ join " " .TagEntry.Architectures }}"'
-	) )"
-}
-
-if ! command -v bashbrew --version &> /dev/null
-then
-    echo "bashbrew could not be found"
-	echo "You can download it from Jenkins at https://github.com/docker-library/bashbrew#installing"
-    exit 1
-fi
-
-getArches 'phpmyadmin'
-
-# Header.
-cat <<-EOH
-# This file is generated via https://github.com/phpmyadmin/docker/blob/$(fileCommit "$self")/$self
-Maintainers: Isaac Bennetch <bennetch@gmail.com> (@ibennetch),
-             William Desportes <williamdes@wdes.fr> (@williamdes)
-GitRepo: https://github.com/phpmyadmin/docker.git
-EOH
-
-# prints "$2$1$3$1...$N"
-join() {
-	local sep="$1"; shift
-	local out; printf -v out "${sep//%/%%}%s" "$@"
-	echo "${out#$sep}"
-}
-
-latest="$(curl -fsSL 'https://www.phpmyadmin.net/home_page/version.json' | jq -r '.version')"
-
-for variant in apache fpm fpm-alpine; do
-	commit="$(dockerfileCommit "$variant")"
-	fullversion="$(git show "$commit":"$variant/Dockerfile" | awk '$1 == "ENV" && $2 == "VERSION" { print $3; exit }')"
-
-	versionAliases=( "$fullversion" "${fullversion%.*}" "${fullversion%.*.*}" )
-	if [ "$fullversion" = "$latest" ]; then
-		versionAliases+=( "latest" )
-	fi
-
-	variantAliases=( "${versionAliases[@]/%/-$variant}" )
-	variantAliases=( "${variantAliases[@]//latest-}" )
-
-	if [ "$variant" = "apache" ]; then
-		variantAliases+=( "${versionAliases[@]}" )
-	fi
-
-	variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$variant/Dockerfile")"
-
-	variantArches="${parentRepoToArches[$variantParent]}"
-
-	cat <<-EOE
-
-		Tags: $(join ', ' "${variantAliases[@]}")
-		Architectures: $(join ', ' $variantArches)
-		GitCommit: $commit
-		Directory: $variant
-	EOE
-done
@@ -1,4 +0,0 @@
-#!/bin/sh
-# This file is used by docker hub to build the image
-
-docker build -t $IMAGE_NAME .
@@ -0,0 +1,20 @@
+[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
@@ -1,6 +1,6 @@
 # Testing image for phpMyAdmin

-FROM phpmyadmin
+FROM phpmyadmin/phpmyadmin

 # Install test dependencies
 RUN set -ex; \
@@ -10,8 +10,7 @@ RUN set -ex; \
 		curl \
 		python-pip \
 	; \
-	pip install setuptools wheel; \
-	pip install mechanize html5lib pytest; \
+	pip install mechanize html5lib; \
 	rm -rf /var/lib/apt/lists/*

-COPY phpmyadmin_test.py test-docker.sh world.sql conftest.py /
+COPY phpmyadmin_test.py test-docker.sh world.sql /
@@ -1,28 +0,0 @@
-import pytest
-
-def pytest_addoption(parser):
-    parser.addoption("--url")
-    parser.addoption("--username")
-    parser.addoption("--password")
-    parser.addoption("--server")
-    parser.addoption("--sqlfile")
-
-@pytest.fixture
-def url(request):
-    return request.config.getoption("--url")
-
-@pytest.fixture
-def username(request):
-    return request.config.getoption("--username")
-
-@pytest.fixture
-def password(request):
-    return request.config.getoption("--password")
-
-@pytest.fixture
-def server(request):
-    return request.config.getoption("--server")
-    
-@pytest.fixture
-def sqlfile(request):
-    return request.config.getoption("--sqlfile")
@@ -1,27 +1,26 @@
 #!/usr/bin/env python2
 import argparse
 import os
-import subprocess
 import re
 import sys

 import mechanize
-import tempfile
-import pytest


-def do_test_content(match, content):
-    assert(match in content)
+def test_content(match, content):
+    if not match in content:
+        print(content)
+        raise Exception('{0} not found in content!'.format(match))

-def test_phpmyadmin(url, username, password, server, sqlfile):
+
+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'):
            sqlfile = './world.sql'
        else:
-            path = os.path.dirname(os.path.realpath(__file__))
-            sqlfile = path + '/world.sql'
+            sqlfile = './testing/world.sql'
    br = mechanize.Browser()

    # Ignore robots.txt
@@ -39,39 +38,36 @@ def test_phpmyadmin(url, username, password, server, sqlfile):

    # Login and check if loggged in
    response = br.submit()
-    do_test_content('Server version', response.read())
+    test_content('Server version', response.read())

    # Open server import
    response = br.follow_link(text_regex=re.compile('Import'))
-    do_test_content('OpenDocument Spreadsheet', response.read())
+    test_content('OpenDocument Spreadsheet', response.read())

    # Upload SQL file
    br.select_form('import')
    br.form.add_file(open(sqlfile), 'text/plain', sqlfile)
    response = br.submit()
-    do_test_content('5326 queries executed', response.read())
+    test_content('5326 queries executed', response.read())


-def docker_secret(env_name):
-    dir_path = os.path.dirname(os.path.realpath(__file__))
-    secret_file = tempfile.mkstemp()
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--url', required=True)
+    parser.add_argument('--username', required=True)
+    parser.add_argument('--password', required=True)
+    parser.add_argument('--server')
+    parser.add_argument('--sqlfile', default=None)
+    args = parser.parse_args()

-    password = "The_super_secret_password"
-    password_file = open(secret_file[1], 'wb')
-    password_file.write(str.encode(password))
-    password_file.close()
+    test_phpmyadmin(
+        args.url,
+        args.username,
+        args.password,
+        args.server,
+        args.sqlfile
+    )

-    test_env = {env_name + '_FILE': secret_file[1]}

-    # Run entrypoint and afterwards echo the environment variables
-    result = subprocess.Popen(dir_path+ "/../docker-entrypoint.sh 'env'", shell=True, stdout=subprocess.PIPE, env=test_env)
-    output = result.stdout.read().decode()
-
-    assert (env_name + "=" + password) in output
-
-def test_phpmyadmin_secrets():
-    docker_secret('MYSQL_PASSWORD')
-    docker_secret('MYSQL_ROOT_PASSWORD')
-    docker_secret('PMA_PASSWORD')
-    docker_secret('PMA_HOSTS')
-    docker_secret('PMA_HOST')
+if __name__ == '__main__':
+    main()
@@ -28,7 +28,6 @@ GREEN="\033[0;32m"
 RED="\033[0;31m"
 NC="\033[0m" # No Color

-
 # Find test script
 if [ -f ./phpmyadmin_test.py ] ; then
    FILENAME=./phpmyadmin_test.py
@@ -76,11 +75,12 @@ fi

 # Perform tests
 ret=0
-pytest -q --url "$PHPMYADMIN_URL" --username root --password "$TESTSUITE_PASSWORD"  $SERVER $FILENAME
+$FILENAME --url "$PHPMYADMIN_URL" --username root --password $TESTSUITE_PASSWORD $SERVER
 ret=$?

 # Show debug output in case of failure
 if [ $ret -ne 0 ] ; then
+    curl "$PHPMYADMIN_URL"
    ${COMMAND_HOST} ps faux
    echo "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: ${RED}FAILED${NC}"
    exit $ret
@@ -1,14 +1,6 @@
 #!/bin/bash
 set -e

-# Check for dependencies
-command -v curl >/dev/null 2>&1 || { echo >&2 "'curl' is required but not found. Aborting."; exit 1; }
-command -v jq >/dev/null 2>&1 || { echo >&2 "'jq' is required but not found. Aborting."; exit 1; }
-if [ -z "${BASH_VERSINFO}" ] || [ -z "${BASH_VERSINFO[0]}" ] || [ ${BASH_VERSINFO[0]} -lt 4 ]; then
-  echo "BASH version 4.0 or greater is required. Aborting."
-  exit 1
-fi
-
 declare -A cmd=(
 	[apache]='apache2-foreground'
 	[fpm]='php-fpm'
@@ -21,17 +13,13 @@ declare -A base=(
 	[fpm-alpine]='alpine'
 )

-latest="$(curl -fsSL 'https://www.phpmyadmin.net/home_page/version.json' | jq -r '.version')"
-sha256="$(curl -fsSL "https://files.phpmyadmin.net/phpMyAdmin/$latest/phpMyAdmin-$latest-all-languages.tar.xz.sha256" | cut -f1 -d ' ' | tr -cd 'a-f0-9' | cut -c 1-64)"
-
 for variant in apache fpm fpm-alpine; do
 	template="Dockerfile-${base[$variant]}.template"
 	cp $template "$variant/Dockerfile"
 	cp config.inc.php "$variant/config.inc.php"
 	cp docker-entrypoint.sh "$variant/docker-entrypoint.sh"
+	cp php.ini "$variant/php.ini"
 	sed -ri -e '
-		s/%%VERSION%%/'"$latest"'/;
-		s/%%SHA256%%/'"$sha256"'/;
 		s/%%VARIANT%%/'"$variant"'/;
 		s/%%CMD%%/'"${cmd[$variant]}"'/;
 	' "$variant/Dockerfile"
Author	SHA1	Message	Date
Isaac Bennetch	8803357e6a	Configure to use snapshot builds for 4.9 series Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2019-06-08 13:56:12 -04:00
Isaac Bennetch	21be77a8e8	Remove GPG verification of downloads, since we don't sign snapshot builds. See also: #131 Fixes: #228 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2019-06-08 13:54:17 -04:00
Isaac Bennetch	db5c629d4a	Set up edge-4.9 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2019-06-05 22:24:05 -04:00