Update to 5.1.0 release

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
Merge #324 - Add expose_php env back
2026-08-24 10:13:22 -05:00 · 2021-02-24 01:44:19 -05:00 · 2021-02-07 22:02:42 +01:00 · 2021-02-07 21:25:36 +01:00 · 2021-02-02 00:12:33 +01:00 · 2021-02-02 00:08:42 +01:00
34 changed files with 913 additions and 587 deletions
@@ -0,0 +1 @@
+*.sql linguist-detectable=false
@@ -0,0 +1,48 @@
+name: GitHub CI
+
+on:
+  pull_request:
+  push:
+  schedule:
+    - cron: 0 0 * * 0
+
+defaults:
+  run:
+    shell: 'bash -Eeuo pipefail -x {0}'
+
+jobs:
+
+  generate-jobs:
+    name: Generate Jobs
+    runs-on: ubuntu-latest
+    outputs:
+      strategy: ${{ steps.generate-jobs.outputs.strategy }}
+    steps:
+      - uses: actions/checkout@v2
+      - id: generate-jobs
+        name: Generate Jobs
+        run: |
+          git clone --depth 1 https://github.com/docker-library/bashbrew.git -b master ~/bashbrew
+          strategy="$(~/bashbrew/scripts/github-actions/generate.sh)"
+          jq . <<<"$strategy" # sanity check / debugging aid
+          echo "::set-output name=strategy::$strategy"
+
+  test:
+    needs: generate-jobs
+    strategy: ${{ fromJson(needs.generate-jobs.outputs.strategy) }}
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Prepare Environment
+        run: ${{ matrix.runs.prepare }}
+      - name: Pull Dependencies
+        run: ${{ matrix.runs.pull }}
+      - name: Build ${{ matrix.name }}
+        run: ${{ matrix.runs.build }}
+      - name: History ${{ matrix.name }}
+        run: ${{ matrix.runs.history }}
+      - name: Test ${{ matrix.name }}
+        run: ${{ matrix.runs.test }}
+      - name: '"docker images"'
+        run: ${{ matrix.runs.images }}
@@ -0,0 +1,26 @@
+name: Internal test suite
+
+on:
+  pull_request:
+  push:
+
+jobs:
+    test-apache-container:
+        name: Test on database ${{ matrix.database-image }}
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                database-image: ["mariadb:10.4", "mysql:5.7", "mariadb:latest", "mysql:latest"]
+
+        steps:
+            - uses: actions/checkout@v2
+            - name: Build images
+              run: docker-compose -f docker-compose.testing.yml build
+            - name: Run normal tests
+              run: docker-compose -f docker-compose.testing.yml up --build --abort-on-container-exit --exit-code-from=sut
+              env:
+                DB: ${{ matrix.database-image }}
+            - name: Run one host tests
+              run: docker-compose -f docker-compose.testing-one-host.yml up --build --abort-on-container-exit --exit-code-from=sut
+              env:
+                DB: ${{ matrix.database-image }}
@@ -1 +1,6 @@
 config.secret.inc.php
+__pycache__
+.pytest_cache
+.vscode
+.history
+.venv
@@ -1,90 +0,0 @@
-services:
-  - docker
-
-language: python
-python: 2.7
-dist: bionic
-
-stages:
-  - name: "Build images"
-  - name: "Test docker-compose"
-  - name: "Run tests in testing container"
-
-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
-
-_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/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-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/phpmyadmin apache
-    - <<: *build-image
-      name: "fpm amd64"
-      arch: amd64
-      script:
-      - docker build -t phpmyadmin/phpmyadmin fpm
-    - <<: *build-image
-      name: "fpm-alpine amd64"
-      arch: amd64
-      script:
-      - docker build -t phpmyadmin/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
@@ -1,8 +1,9 @@
-FROM php:7.2-%%VARIANT%%
+FROM php:7.4-%%VARIANT%%

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

 # Install dependencies
 RUN set -ex; \
@@ -14,10 +15,17 @@ RUN set -ex; \
        libpng-dev \
        libwebp-dev \
        libxpm-dev \
+        libzip-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; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
+    docker-php-ext-install -j "$(nproc)" \
+        bz2 \
+        gd \
+        mysqli \
+        opcache \
+        zip \
+    ; \
    \
    runDeps="$( \
        scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
@@ -26,34 +34,51 @@ RUN set -ex; \
            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
    )"; \
    apk add --virtual .phpmyadmin-phpexts-rundeps $runDeps; \
-    apk del .build-deps
+    apk del --no-network .build-deps

 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
-RUN { \
+ENV MAX_EXECUTION_TIME 600
+ENV MEMORY_LIMIT 512M
+ENV UPLOAD_LIMIT 2048K
+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'; \
-        echo 'opcache.enable_cli=1'; \
-    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
+    } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \
    \
    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > /usr/local/etc/php/conf.d/session-strict.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'; \
-    } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini
+        echo 'allow_url_fopen=Off'; \
+        echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \
+        echo 'max_input_vars=10000'; \
+        echo 'memory_limit=${MEMORY_LIMIT}'; \
+        echo 'post_max_size=${UPLOAD_LIMIT}'; \
+        echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini

 # Calculate download URL
 ENV VERSION %%VERSION%%
+ENV SHA256 %%SHA256%%
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/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
 RUN set -ex; \
@@ -63,24 +88,23 @@ RUN set -ex; \
    \
    export GNUPGHOME="$(mktemp -d)"; \
    export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
-    curl --output phpMyAdmin.tar.xz --location $URL; \
-    curl --output phpMyAdmin.tar.xz.asc --location $URL.asc; \
+    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 /usr/src; \
+    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; \
-    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
+    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

 # Copy configuration
 COPY config.inc.php /etc/phpmyadmin/config.inc.php
@@ -1,4 +1,4 @@
-FROM php:7.2-%%VARIANT%%
+FROM php:7.4-%%VARIANT%%

 # Install dependencies
 RUN set -ex; \
@@ -13,10 +13,17 @@ RUN set -ex; \
        libpng-dev \
        libwebp-dev \
        libxpm-dev \
+        libzip-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; \
+    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; \
@@ -33,61 +40,81 @@ RUN set -ex; \

 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
-RUN { \
+ENV MAX_EXECUTION_TIME 600
+ENV MEMORY_LIMIT 512M
+ENV UPLOAD_LIMIT 2048K
+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'; \
-        echo 'opcache.enable_cli=1'; \
-    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
+    } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \
    \
    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > /usr/local/etc/php/conf.d/session-strict.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'; \
-    } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini
+        echo 'allow_url_fopen=Off'; \
+        echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \
+        echo 'max_input_vars=10000'; \
+        echo 'memory_limit=${MEMORY_LIMIT}'; \
+        echo 'post_max_size=${UPLOAD_LIMIT}'; \
+        echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini

 # Calculate download URL
 ENV VERSION %%VERSION%%
+ENV SHA256 %%SHA256%%
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/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
 RUN set -ex; \
-    fetchDeps=" \
+    \
+    savedAptMark="$(apt-mark showmanual)"; \
+    \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
        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; \
+    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 /usr/src; \
+    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; \
-    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; \
+    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-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
+    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/*

 # Copy configuration
@@ -1,4 +1,4 @@
-DOCKER_REPO = phpmyadmin/phpmyadmin
+DOCKER_REPO = phpmyadmin

 .PHONY: all build run logs clean stop rm prune

@@ -18,6 +18,9 @@ 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,12 +1,22 @@
 # Official phpMyAdmin Docker image

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

-[![Build Status](https://travis-ci.org/phpmyadmin/docker.svg?branch=master)](https://travis-ci.org/phpmyadmin/docker)
-[![Docker Pulls](https://img.shields.io/docker/pulls/phpmyadmin/phpmyadmin.svg)][hub]
-[![Docker Stars](https://img.shields.io/docker/stars/phpmyadmin/phpmyadmin.svg)][hub]
-[![Docker Layers](https://images.microbadger.com/badges/image/phpmyadmin/phpmyadmin.svg)](https://microbadger.com/images/phpmyadmin/phpmyadmin "Get your own image badge on microbadger.com")
-[![Docker Version](https://images.microbadger.com/badges/version/phpmyadmin/phpmyadmin.svg)](https://microbadger.com/images/phpmyadmin/phpmyadmin "Get your own version badge on microbadger.com")
+[![GitHub CI build status badge](https://github.com/phpmyadmin/docker/workflows/GitHub%20CI/badge.svg)](https://github.com/phpmyadmin/docker/actions?query=workflow%3A%22GitHub+CI%22)
+[![update.sh build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/phpmyadmin.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/phpmyadmin/)
+[![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")


 All following examples will bring you phpMyAdmin on `http://localhost:8080`
@@ -14,60 +24,62 @@ where you can enjoy your happy MySQL administration.

 ## Credentials

-phpMyAdmin does use MySQL server credential, please check the corresponding
-server image for information how it is setup.
+phpMyAdmin connects using your MySQL server credentials. Please check the corresponding
+database server image for information on what the default username and password are.
+To modify username and password during installation you can check the corresponding
+database server image on Docker Hub.

-The official MySQL and MariaDB use following environment variables to define these:
+The official MySQL and MariaDB use the following environment variables to define these:

 * `MYSQL_ROOT_PASSWORD` - This variable is mandatory and specifies the password that will be set for the `root` superuser account.
 * `MYSQL_USER`, `MYSQL_PASSWORD` - These variables are optional, used in conjunction to create a new user and to set that user's password.

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

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

-* `latest` - latest stable release
-* `4.8` - latest stable release for the 4.8 version
-* `4.8.5` - specific patch release for the 4.8 version
+* `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`

-For each tag the following variants are provided:
+A complete list of tags is [available at Docker Hub](https://hub.docker.com/_/phpmyadmin?tab=tags)

-### apache
+## Image variants

-This starts an Apache webserver with PHP, so you can use phpMyAdmin out of the box.
+We provide three variations:

-### fpm-alpine
-
-This image has a very small footprint. It is based on Alpine Linux and starts only 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.
-
-### fpm
-
-This image starts only a PHP FPM container. Use this variant if you already have a seperate webserver.
+* "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.

 ## Usage with linked server

-First you need to run MySQL or MariaDB server in Docker, and this image need
-link a running mysql instance container:
+First you need to run a MySQL or MariaDB server in Docker, and the phpMyAdmin image needs to be
+linked to the running database container:

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

 ## Usage with external server

-You can specify MySQL host in the `PMA_HOST` environment variable. You can also
+You can specify a 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/phpmyadmin
+```sh
+docker run --name myadmin -d -e PMA_HOST=dbhost -p 8080:80 phpmyadmin
 ```

 ## Usage with arbitrary server

 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/phpmyadmin
+```sh
+docker run --name myadmin -d -e PMA_ARBITRARY=1 -p 8080:80 phpmyadmin
 ```

 ## Usage with docker-compose and arbitrary server
@@ -77,7 +89,7 @@ server on login page.

 Using the docker-compose.yml from https://github.com/phpmyadmin/docker

-```
+```sh
 docker-compose up -d
 ```

@@ -87,22 +99,24 @@ You can run the E2E tests with the local test environment by running MariaDB/MyS

 Using the docker-compose.testing.yml from https://github.com/phpmyadmin/docker

-```
+```sh
 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:

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

 See the following links for config file information.
@@ -124,14 +138,40 @@ 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
+* ``PMA_CONFIG_BASE64`` - if set, this option will override the default `config.inc.php` with the base64 decoded contents of the variable
+* ``PMA_USER_CONFIG_BASE64`` - if set, this option will override the default `config.user.inc.php` with the base64 decoded contents of the variable
+* ``PMA_ABSOLUTE_URI`` - the full URL to phpMyAdmin. Sometimes needed when used in a reverse-proxy configuration. Don't set this unless needed. See [documentation](https://docs.phpmyadmin.net/en/latest/config.html#cfg_PmaAbsoluteUri).
+* ``PMA_CONTROLHOST`` - when set, this points to an alternate database host used for storing the [phpMyAdmin Configuration Storage database](https://docs.phpmyadmin.net/en/latest/setup.html#phpmyadmin-configuration-storage) database
+* ``PMA_CONTROLPORT`` - if set, will override the default port (3306) for connecting to the control host for storing the [phpMyAdmin Configuration Storage database](https://docs.phpmyadmin.net/en/latest/setup.html#phpmyadmin-configuration-storage) database
+* ``PMA_PMADB`` - define the name of the database to be used for the [phpMyAdmin Configuration Storage database](https://docs.phpmyadmin.net/en/latest/setup.html#phpmyadmin-configuration-storage). When not set, the advanced features are not enabled by default (they can still potentially be enabled by the user when logging in with the zero conf (zero configuration) feature. Suggested values: `phpmyadmin` or `pmadb`
+* ``PMA_CONTROLUSER`` - define the username for phpMyAdmin to use for advanced features (the [controluser](https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_controluser))
+* ``PMA_CONTROLPASS`` - define the password for phpMyAdmin to use with the [controluser](https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_controlpass)
+* ``PMA_QUERYHISTORYDB`` - when set [to true](https://docs.phpmyadmin.net/en/latest/config.html#cfg_QueryHistoryDB), enables storing [SQL history](https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_history) to the [phpMyAdmin Configuration Storage database](https://docs.phpmyadmin.net/en/latest/setup.html#phpmyadmin-configuration-storage). When [false](https://docs.phpmyadmin.net/en/latest/config.html#cfg_QueryHistoryDB), history is stored in the browser and is cleared when logging out
+* ``PMA_QUERYHISTORYMAX`` - when set to an integer, controls the number of history items. See [documentation](https://docs.phpmyadmin.net/en/latest/config.html#cfg_QueryHistoryMax). Defaults to `25`.
+* ``MAX_EXECUTION_TIME`` - if set, will override the maximum execution time in seconds (default 600) for phpMyAdmin ([$cfg['ExecTimeLimit']](https://docs.phpmyadmin.net/en/latest/config.html#cfg_ExecTimeLimit)) and PHP [max_execution_time](https://www.php.net/manual/en/info.configuration.php#ini.max-execution-time) (format as `[0-9+]`)
+* ``MEMORY_LIMIT`` - if set, will override the memory limit (default 512M) for phpMyAdmin ([$cfg['MemoryLimit']](https://docs.phpmyadmin.net/en/latest/config.html#cfg_MemoryLimit)) and PHP [memory_limit](https://www.php.net/manual/en/ini.core.php#ini.memory-limit) (format as `[0-9+](K,M,G)`)
+* ``UPLOAD_LIMIT`` - if set, this option 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)
+* ``HIDE_PHP_VERSION`` - if defined, this option will hide the PHP version (`expose_php = Off`). Set to any value (such as `HIDE_PHP_VERSION=true`).

-For usage with Docker secrets, appending ``_FILE`` to any environment variable is allowed:
-```
-docker run --name myadmin -d -e PMA_PASSWORD_FILE=/run/secrets/db_password.txt -p 8080:80 phpmyadmin/phpmyadmin
+For usage with Docker secrets, appending ``_FILE`` to the ``PMA_PASSWORD`` environment variable is allowed (it overrides ``PMA_PASSWORD`` if it is set):
+
+```sh
+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`
+- `PMA_CONTROLPASS`
+
 For more detailed documentation see https://docs.phpmyadmin.net/en/latest/setup.html#installing-using-docker

-[hub]: https://hub.docker.com/r/phpmyadmin/phpmyadmin/
+[hub]: https://hub.docker.com/_/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,4 +1,4 @@
-FROM php:7.2-apache
+FROM php:7.4-apache

 # Install dependencies
 RUN set -ex; \
@@ -13,10 +13,17 @@ RUN set -ex; \
        libpng-dev \
        libwebp-dev \
        libxpm-dev \
+        libzip-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; \
+    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; \
@@ -33,61 +40,81 @@ RUN set -ex; \

 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
-RUN { \
+ENV MAX_EXECUTION_TIME 600
+ENV MEMORY_LIMIT 512M
+ENV UPLOAD_LIMIT 2048K
+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'; \
-        echo 'opcache.enable_cli=1'; \
-    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
+    } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \
    \
    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > /usr/local/etc/php/conf.d/session-strict.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'; \
-    } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini
+        echo 'allow_url_fopen=Off'; \
+        echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \
+        echo 'max_input_vars=10000'; \
+        echo 'memory_limit=${MEMORY_LIMIT}'; \
+        echo 'post_max_size=${UPLOAD_LIMIT}'; \
+        echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini

 # Calculate download URL
-ENV VERSION 4.9.1
+ENV VERSION 5.1.0
+ENV SHA256 aa8ccf357f672012384df34e1c2bc70147476761c8458a0dad6233497e142c68
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/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
 RUN set -ex; \
-    fetchDeps=" \
+    \
+    savedAptMark="$(apt-mark showmanual)"; \
+    \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
        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; \
+    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 /usr/src; \
+    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; \
-    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; \
+    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-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
+    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/*

 # Copy configuration
@@ -21,7 +21,10 @@ $vars = array(
    'PMA_PMADB',
    'PMA_CONTROLUSER',
    'PMA_CONTROLPASS',
-    'PMA_QUERYHISTORYDB'
+    'PMA_QUERYHISTORYDB',
+    'PMA_QUERYHISTORYMAX',
+    'MAX_EXECUTION_TIME',
+    'MEMORY_LIMIT'
 );
 foreach ($vars as $var) {
    $env = getenv($var);
@@ -33,6 +36,10 @@ if (isset($_ENV['PMA_QUERYHISTORYDB'])) {
    $cfg['QueryHistoryDB'] = boolval($_ENV['PMA_QUERYHISTORYDB']);
 }

+if (isset($_ENV['PMA_QUERYHISTORYMAX'])) {
+    $cfg['QueryHistoryMax'] = intval($_ENV['PMA_QUERYHISTORYMAX']);
+}
+
 /* Arbitrary server connection */
 if (isset($_ENV['PMA_ARBITRARY']) && $_ENV['PMA_ARBITRARY'] === '1') {
    $cfg['AllowArbitraryServer'] = true;
@@ -131,6 +138,14 @@ $i--;
 $cfg['UploadDir'] = '';
 $cfg['SaveDir'] = '';

+if (isset($_ENV['MAX_EXECUTION_TIME'])) {
+    $cfg['ExecTimeLimit'] = $_ENV['MAX_EXECUTION_TIME'];
+}
+
+if (isset($_ENV['MEMORY_LIMIT'])) {
+    $cfg['MemoryLimit'] = $_ENV['MEMORY_LIMIT'];
+}
+
 /* Include User Defined Settings Hook */
 if (file_exists('/etc/phpmyadmin/config.user.inc.php')) {
    include('/etc/phpmyadmin/config.user.inc.php');
@@ -1,39 +1,5 @@
 #!/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
@@ -47,4 +13,38 @@ 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
+
+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
+get_docker_secret PMA_CONTROLPASS
+
 exec "$@"
@@ -21,7 +21,10 @@ $vars = array(
    'PMA_PMADB',
    'PMA_CONTROLUSER',
    'PMA_CONTROLPASS',
-    'PMA_QUERYHISTORYDB'
+    'PMA_QUERYHISTORYDB',
+    'PMA_QUERYHISTORYMAX',
+    'MAX_EXECUTION_TIME',
+    'MEMORY_LIMIT'
 );
 foreach ($vars as $var) {
    $env = getenv($var);
@@ -33,6 +36,10 @@ if (isset($_ENV['PMA_QUERYHISTORYDB'])) {
    $cfg['QueryHistoryDB'] = boolval($_ENV['PMA_QUERYHISTORYDB']);
 }

+if (isset($_ENV['PMA_QUERYHISTORYMAX'])) {
+    $cfg['QueryHistoryMax'] = intval($_ENV['PMA_QUERYHISTORYMAX']);
+}
+
 /* Arbitrary server connection */
 if (isset($_ENV['PMA_ARBITRARY']) && $_ENV['PMA_ARBITRARY'] === '1') {
    $cfg['AllowArbitraryServer'] = true;
@@ -131,6 +138,14 @@ $i--;
 $cfg['UploadDir'] = '';
 $cfg['SaveDir'] = '';

+if (isset($_ENV['MAX_EXECUTION_TIME'])) {
+    $cfg['ExecTimeLimit'] = $_ENV['MAX_EXECUTION_TIME'];
+}
+
+if (isset($_ENV['MEMORY_LIMIT'])) {
+    $cfg['MemoryLimit'] = $_ENV['MEMORY_LIMIT'];
+}
+
 /* Include User Defined Settings Hook */
 if (file_exists('/etc/phpmyadmin/config.user.inc.php')) {
    include('/etc/phpmyadmin/config.user.inc.php');
@@ -1,3 +0,0 @@
-phpmyadmin:
-    external_links:
-        - db_server:db
@@ -0,0 +1,69 @@
+version: "3.1"
+
+services:
+  db_server:
+    image: ${DB:-mariadb:10.3}
+    container_name: phpmyadmin_testing_db
+    environment:
+      MYSQL_ROOT_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-uroot", "-p${TESTSUITE_PASSWORD:-my-secret-pw}"]
+      start_period: 5s
+      interval: 5s
+      timeout: 60s
+      retries: 10
+    networks:
+      testing:
+    volumes:
+      - ./testing/testing.cnf:/etc/mysql/conf.d/testing.cnf:ro
+    tmpfs:
+      - /var/lib/mysql:rw,noexec,nosuid,size=300m
+
+  phpmyadmin:
+    build:
+      context: apache
+    container_name: phpmyadmin_testing_apache
+    environment:
+      PMA_HOST: db_server
+      UPLOAD_LIMIT: 123M
+      MAX_EXECUTION_TIME: 125
+      HIDE_PHP_VERSION: 1
+    volumes:
+      - ./testing/config.user.inc.php:/etc/phpmyadmin/config.user.inc.php
+    healthcheck:
+      test: ["CMD", "curl", "-Ss", "http://localhost/robots.txt"]
+      start_period: 5s
+      interval: 3s
+      timeout: 60s
+      retries: 10
+    networks:
+      testing:
+    depends_on:
+      db_server:
+        condition: service_healthy
+
+  sut:
+    depends_on:
+      phpmyadmin:
+        condition: service_healthy
+      db_server:
+        condition: service_healthy
+    build:
+      context: testing
+    command: "/tests/testing/test-docker.sh"
+    networks:
+      testing:
+    environment:
+      TESTSUITE_HOSTNAME: phpmyadmin_testing_apache
+      TESTSUITE_PORT: 80
+      TESTSUITE_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
+      PMA_HOST: phpmyadmin_testing_db
+      PMA_PORT: 3306
+    volumes:
+      - ./:/tests:ro
+      - /var/run/docker.sock:/var/run/docker.sock
+    working_dir: /tests
+
+networks:
+    testing:
+        driver: bridge
@@ -1,26 +1,69 @@
-version: '2'
+version: "3.1"

 services:
  db_server:
-    image: ${DB}
+    image: ${DB:-mariadb:10.3}
    container_name: phpmyadmin_testing_db
    environment:
-      - MYSQL_ROOT_PASSWORD=${TESTSUITE_PASSWORD}
+      MYSQL_ROOT_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-uroot", "-p${TESTSUITE_PASSWORD:-my-secret-pw}"]
+      start_period: 5s
+      interval: 5s
+      timeout: 60s
+      retries: 10
+    networks:
+      testing:
    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
-    ports:
-      - 8090:80
+      context: apache
+    container_name: phpmyadmin_testing_apache
    environment:
-      - PMA_ARBITRARY=1
-      - TESTSUITE_PASSWORD=${TESTSUITE_PASSWORD}
+      PMA_ARBITRARY: 1
+      UPLOAD_LIMIT: 123M
+      MAX_EXECUTION_TIME: 125
+      HIDE_PHP_VERSION: 1
+    volumes:
+      - ./testing/config.user.inc.php:/etc/phpmyadmin/config.user.inc.php
+    healthcheck:
+      test: ["CMD", "curl", "-Ss", "http://localhost/robots.txt"]
+      start_period: 5s
+      interval: 3s
+      timeout: 60s
+      retries: 10
+    networks:
+      testing:
    depends_on:
-      - db_server
+      db_server:
+        condition: service_healthy
+
+  sut:
+    depends_on:
+      phpmyadmin:
+        condition: service_healthy
+      db_server:
+        condition: service_healthy
+    build:
+      context: testing
+    command: "/tests/testing/test-docker.sh"
+    networks:
+      testing:
+    environment:
+      TESTSUITE_HOSTNAME_ARBITRARY: 1
+      TESTSUITE_HOSTNAME: phpmyadmin_testing_apache
+      PMA_HOST: phpmyadmin_testing_db
+      TESTSUITE_PORT: 80
+      TESTSUITE_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
+    volumes:
+      - ./:/tests:ro
+      - /var/run/docker.sock:/var/run/docker.sock
+    working_dir: /tests
+
+networks:
+    testing:
+        driver: bridge
@@ -1,5 +1,5 @@
 phpmyadmin:
-    image: phpmyadmin/phpmyadmin
+    image: phpmyadmin
    container_name: phpmyadmin
    environment:
     - PMA_ARBITRARY=1
@@ -1,39 +1,5 @@
 #!/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
@@ -47,4 +13,38 @@ 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
+
+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
+get_docker_secret PMA_CONTROLPASS
+
 exec "$@"
@@ -1,8 +1,9 @@
-FROM php:7.2-fpm-alpine
+FROM php:7.4-fpm-alpine

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

 # Install dependencies
 RUN set -ex; \
@@ -14,10 +15,17 @@ RUN set -ex; \
        libpng-dev \
        libwebp-dev \
        libxpm-dev \
+        libzip-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; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
+    docker-php-ext-install -j "$(nproc)" \
+        bz2 \
+        gd \
+        mysqli \
+        opcache \
+        zip \
+    ; \
    \
    runDeps="$( \
        scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
@@ -26,34 +34,51 @@ RUN set -ex; \
            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
    )"; \
    apk add --virtual .phpmyadmin-phpexts-rundeps $runDeps; \
-    apk del .build-deps
+    apk del --no-network .build-deps

 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
-RUN { \
+ENV MAX_EXECUTION_TIME 600
+ENV MEMORY_LIMIT 512M
+ENV UPLOAD_LIMIT 2048K
+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'; \
-        echo 'opcache.enable_cli=1'; \
-    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
+    } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \
    \
    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > /usr/local/etc/php/conf.d/session-strict.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'; \
-    } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini
+        echo 'allow_url_fopen=Off'; \
+        echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \
+        echo 'max_input_vars=10000'; \
+        echo 'memory_limit=${MEMORY_LIMIT}'; \
+        echo 'post_max_size=${UPLOAD_LIMIT}'; \
+        echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini

 # Calculate download URL
-ENV VERSION 4.9.1
+ENV VERSION 5.1.0
+ENV SHA256 aa8ccf357f672012384df34e1c2bc70147476761c8458a0dad6233497e142c68
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/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
 RUN set -ex; \
@@ -63,24 +88,23 @@ RUN set -ex; \
    \
    export GNUPGHOME="$(mktemp -d)"; \
    export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
-    curl --output phpMyAdmin.tar.xz --location $URL; \
-    curl --output phpMyAdmin.tar.xz.asc --location $URL.asc; \
+    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 /usr/src; \
+    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; \
-    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
+    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

 # Copy configuration
 COPY config.inc.php /etc/phpmyadmin/config.inc.php
@@ -21,7 +21,10 @@ $vars = array(
    'PMA_PMADB',
    'PMA_CONTROLUSER',
    'PMA_CONTROLPASS',
-    'PMA_QUERYHISTORYDB'
+    'PMA_QUERYHISTORYDB',
+    'PMA_QUERYHISTORYMAX',
+    'MAX_EXECUTION_TIME',
+    'MEMORY_LIMIT'
 );
 foreach ($vars as $var) {
    $env = getenv($var);
@@ -33,6 +36,10 @@ if (isset($_ENV['PMA_QUERYHISTORYDB'])) {
    $cfg['QueryHistoryDB'] = boolval($_ENV['PMA_QUERYHISTORYDB']);
 }

+if (isset($_ENV['PMA_QUERYHISTORYMAX'])) {
+    $cfg['QueryHistoryMax'] = intval($_ENV['PMA_QUERYHISTORYMAX']);
+}
+
 /* Arbitrary server connection */
 if (isset($_ENV['PMA_ARBITRARY']) && $_ENV['PMA_ARBITRARY'] === '1') {
    $cfg['AllowArbitraryServer'] = true;
@@ -131,6 +138,14 @@ $i--;
 $cfg['UploadDir'] = '';
 $cfg['SaveDir'] = '';

+if (isset($_ENV['MAX_EXECUTION_TIME'])) {
+    $cfg['ExecTimeLimit'] = $_ENV['MAX_EXECUTION_TIME'];
+}
+
+if (isset($_ENV['MEMORY_LIMIT'])) {
+    $cfg['MemoryLimit'] = $_ENV['MEMORY_LIMIT'];
+}
+
 /* Include User Defined Settings Hook */
 if (file_exists('/etc/phpmyadmin/config.user.inc.php')) {
    include('/etc/phpmyadmin/config.user.inc.php');
@@ -1,39 +1,5 @@
 #!/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
@@ -47,4 +13,38 @@ 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
+
+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
+get_docker_secret PMA_CONTROLPASS
+
 exec "$@"
@@ -1,4 +1,4 @@
-FROM php:7.2-fpm
+FROM php:7.4-fpm

 # Install dependencies
 RUN set -ex; \
@@ -13,10 +13,17 @@ RUN set -ex; \
        libpng-dev \
        libwebp-dev \
        libxpm-dev \
+        libzip-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; \
+    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; \
@@ -33,61 +40,81 @@ RUN set -ex; \

 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
-RUN { \
+ENV MAX_EXECUTION_TIME 600
+ENV MEMORY_LIMIT 512M
+ENV UPLOAD_LIMIT 2048K
+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'; \
-        echo 'opcache.enable_cli=1'; \
-    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
+    } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \
    \
    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > /usr/local/etc/php/conf.d/session-strict.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'; \
-    } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini
+        echo 'allow_url_fopen=Off'; \
+        echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \
+        echo 'max_input_vars=10000'; \
+        echo 'memory_limit=${MEMORY_LIMIT}'; \
+        echo 'post_max_size=${UPLOAD_LIMIT}'; \
+        echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini

 # Calculate download URL
-ENV VERSION 4.9.1
+ENV VERSION 5.1.0
+ENV SHA256 aa8ccf357f672012384df34e1c2bc70147476761c8458a0dad6233497e142c68
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/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
 RUN set -ex; \
-    fetchDeps=" \
+    \
+    savedAptMark="$(apt-mark showmanual)"; \
+    \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
        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; \
+    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 /usr/src; \
+    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; \
-    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; \
+    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-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
+    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/*

 # Copy configuration
@@ -21,7 +21,10 @@ $vars = array(
    'PMA_PMADB',
    'PMA_CONTROLUSER',
    'PMA_CONTROLPASS',
-    'PMA_QUERYHISTORYDB'
+    'PMA_QUERYHISTORYDB',
+    'PMA_QUERYHISTORYMAX',
+    'MAX_EXECUTION_TIME',
+    'MEMORY_LIMIT'
 );
 foreach ($vars as $var) {
    $env = getenv($var);
@@ -33,6 +36,10 @@ if (isset($_ENV['PMA_QUERYHISTORYDB'])) {
    $cfg['QueryHistoryDB'] = boolval($_ENV['PMA_QUERYHISTORYDB']);
 }

+if (isset($_ENV['PMA_QUERYHISTORYMAX'])) {
+    $cfg['QueryHistoryMax'] = intval($_ENV['PMA_QUERYHISTORYMAX']);
+}
+
 /* Arbitrary server connection */
 if (isset($_ENV['PMA_ARBITRARY']) && $_ENV['PMA_ARBITRARY'] === '1') {
    $cfg['AllowArbitraryServer'] = true;
@@ -131,6 +138,14 @@ $i--;
 $cfg['UploadDir'] = '';
 $cfg['SaveDir'] = '';

+if (isset($_ENV['MAX_EXECUTION_TIME'])) {
+    $cfg['ExecTimeLimit'] = $_ENV['MAX_EXECUTION_TIME'];
+}
+
+if (isset($_ENV['MEMORY_LIMIT'])) {
+    $cfg['MemoryLimit'] = $_ENV['MEMORY_LIMIT'];
+}
+
 /* Include User Defined Settings Hook */
 if (file_exists('/etc/phpmyadmin/config.user.inc.php')) {
    include('/etc/phpmyadmin/config.user.inc.php');
@@ -1,39 +1,5 @@
 #!/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
@@ -47,4 +13,38 @@ 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
+
+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
+get_docker_secret PMA_CONTROLPASS
+
 exec "$@"
@@ -25,28 +25,35 @@ dockerfileCommit() {
 	)
 }

-# depends on docker library
-#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 }}"'
-#	) )"
-#}
-#getArches 'phpmyadmin'
+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>
-             Michal Čihař <michal@cihar.com>
+Maintainers: Isaac Bennetch <bennetch@gmail.com> (@ibennetch),
+             William Desportes <williamdes@wdes.fr> (@williamdes)
 GitRepo: https://github.com/phpmyadmin/docker.git
 EOH

@@ -57,13 +64,7 @@ join() {
 	echo "${out#$sep}"
 }

-latest="$(
-	git ls-remote --tags https://github.com/phpmyadmin/phpmyadmin.git \
-		| cut -d/ -f3 \
-		| grep -vE -- '-rc|-b' \
-		| sort -V \
-		| tail -1
-)"
+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")"
@@ -83,9 +84,7 @@ for variant in apache fpm fpm-alpine; do

 	variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$variant/Dockerfile")"

-	# depends on docker library
-	#variantArches="${parentRepoToArches[$variantParent]}"
-	variantArches="amd64 arm32v7 arm64v8 i386 ppc64le"
+	variantArches="${parentRepoToArches[$variantParent]}"

 	cat <<-EOE

@@ -0,0 +1,4 @@
+#!/bin/sh
+# This file is used by docker hub to build the image
+
+docker build -t $IMAGE_NAME .
@@ -1,16 +1,9 @@
 # Testing image for phpMyAdmin

-FROM phpmyadmin/phpmyadmin
+FROM alpine:3.12

 # Install test dependencies
 RUN set -ex; \
 	\
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		curl \
-		python-pip \
-	; \
-	pip install mechanize html5lib; \
-	rm -rf /var/lib/apt/lists/*
-
-COPY phpmyadmin_test.py test-docker.sh world.sql /
+	apk add --no-cache --update mariadb-client bash \
+	py3-html5lib py3-pytest py3-mechanize
@@ -0,0 +1,3 @@
+<?php
+
+$cfg['ShowPhpInfo'] = true;
@@ -0,0 +1,28 @@
+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,31 +1,22 @@
 #!/usr/bin/env python2
 import argparse
 import os
+import subprocess
 import re
 import sys

 import mechanize
+import tempfile
+import pytest

-
-def test_content(match, content):
-    if not match in content:
-        print(content)
-        raise Exception('{0} not found in content!'.format(match))
-
-
-def test_phpmyadmin(url, username, password, server=None, sqlfile=None):
-    if sqlfile is None:
-        if os.path.exists('/world.sql'):
-            sqlfile = '/world.sql'
-        elif os.path.exists('./world.sql'):
-            sqlfile = './world.sql'
-        else:
-            sqlfile = './testing/world.sql'
+def create_browser():
    br = mechanize.Browser()

    # Ignore robots.txt
    br.set_handle_robots(False)
+    return br

+def do_login(br, url, username, password, server):
    # Login page
    br.open(url)

@@ -36,38 +27,81 @@ def test_phpmyadmin(url, username, password, server=None, sqlfile=None):
    if server is not None:
        br['pma_servername'] = server

-    # Login and check if loggged in
+    # Login and check if logged in
    response = br.submit()
-    test_content('Server version', response.read())
+    return response
+
+def test_phpmyadmin(url, username, password, server, sqlfile):
+    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'
+
+    br = create_browser()
+
+    response = do_login(br, url, username, password, server)
+
+    assert(b'Server version' in response.read())

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

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


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

-    test_phpmyadmin(
-        args.url,
-        args.username,
-        args.password,
-        args.server,
-        args.sqlfile
-    )
+    password = "The_super_secret_password"
+    password_file = open(secret_file[1], 'wb')
+    password_file.write(str.encode(password))
+    password_file.close()
+
+    test_env = {env_name + '_FILE': secret_file[1]}
+
+    # Run entrypoint and afterwards echo the environment variables
+    result = subprocess.Popen("bash " +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')
+    docker_secret('PMA_CONTROLPASS')


-if __name__ == '__main__':
-    main()
+def test_php_ini(url, username, password, server):
+    br = create_browser()
+    response = do_login(br, url, username, password, server)
+
+    assert(b'Show PHP information' in response.read())
+
+    # Open Show PHP information
+    response = br.follow_link(text_regex=re.compile('Show PHP information'))
+    response = response.read()
+    assert(b'PHP Version' in response)
+
+    assert(b'upload_max_filesize' in response)
+    assert(b'post_max_size' in response)
+    assert(b'expose_php' in response)
+
+    assert(b'<tr><td class="e">max_execution_time</td><td class="v">125</td><td class="v">125</td></tr>' in response)
+
+    assert(b'<tr><td class="e">upload_max_filesize</td><td class="v">123M</td><td class="v">123M</td></tr>' in response)
+    assert(b'<tr><td class="e">post_max_size</td><td class="v">123M</td><td class="v">123M</td></tr>' in response)
+
+    assert(b'<tr><td class="e">expose_php</td><td class="v">Off</td><td class="v">Off</td></tr>' in response)
@@ -1,32 +1,17 @@
 #!/bin/sh

-NAME="$1"
-
-if [ -n "$2" ] ; then
-    PORT="$2"
-    TESTSUITE_PORT=$2
-fi
-
-if [ -n "$3" ] ; then
-    SERVER="--server $3"
-    PMA_HOST=$3
-else
-    SERVER=''
-fi
-
-# Set PHPMyAdmin environment
+# Set phpMyAdmin environment
 PHPMYADMIN_HOSTNAME=${TESTSUITE_HOSTNAME:=localhost}
 PHPMYADMIN_PORT=${TESTSUITE_PORT:=80}
-PHPMYADMIN_URL=http://$PHPMYADMIN_HOSTNAME:$PORT/
+PHPMYADMIN_URL=http://${PHPMYADMIN_HOSTNAME}:${PHPMYADMIN_PORT}/

 # Set database environment
 PHPMYADMIN_DB_HOSTNAME=${PMA_HOST:=localhost}
 PHPMYADMIN_DB_PORT=${PMA_PORT:=3306}

-# Color text output
-GREEN="\033[0;32m"
-RED="\033[0;31m"
-NC="\033[0m" # No Color
+if [ ! -z "${TESTSUITE_HOSTNAME_ARBITRARY}" ]; then
+    SERVER="--server ${PHPMYADMIN_DB_HOSTNAME}"
+fi

 # Find test script
 if [ -f ./phpmyadmin_test.py ] ; then
@@ -35,55 +20,24 @@ else
    FILENAME=./testing/phpmyadmin_test.py
 fi

-# Check if script is running inside container
-if ! [ -f /.dockerenv ] ; then
-    echo "Tests running outside container..."
-    COMMAND_HOST="docker exec ${NAME}"
-    docker ps -a
+mysql -h "${PHPMYADMIN_DB_HOSTNAME}" -P"${PHPMYADMIN_DB_PORT}" -u"${TESTSUITE_USER:=root}" -p"${TESTSUITE_PASSWORD}" -e "SELECT @@version;" > /dev/null
+ret=$?

-    # Wait for database to start
-    TIMEOUT=0
-    while [ $(docker logs db_server 2>&1 | fgrep -c "mysqld: ready for connections.") -le 0 ] ; do
-        echo "Waiting for ${PHPMYADMIN_DB_HOSTNAME} database start..."
-        sleep 10
-        TIMEOUT=$((TIMEOUT + 1))
-        if [ $TIMEOUT -gt 3 ] ; then
-            echo "Failed to connect ${PHPMYADMIN_DB_HOSTNAME} database!"
-            echo "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: ${RED}FAILED${NC}"
-            docker logs ${NAME}
-            exit 1
-        fi
-    done
-
-    # Wait for container to start
-    TIMEOUT=0
-    while [ $(docker logs ${NAME} 2>&1 | fgrep -c "Command line: 'apache2 -D FOREGROUND'") -le 0 ] ; do
-        echo "Waiting for PHPMyAdmin start..."
-        sleep 1
-        TIMEOUT=$((TIMEOUT + 1))
-        if [ $TIMEOUT -gt 10 ] ; then
-            echo "Failed to connect PHPMyAdmin!"
-            echo "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: ${RED}FAILED${NC}"
-            docker logs ${NAME}
-            exit 1
-        fi
-    done
-else
-    echo "Tests running inside container..."
-    FILENAME=/phpmyadmin_test.py
+if [ $ret -ne 0 ] ; then
+    echo "Could not connect to ${PHPMYADMIN_DB_HOSTNAME} on port ${PHPMYADMIN_DB_PORT}"
+    exit $ret
 fi

 # Perform tests
 ret=0
-$FILENAME --url "$PHPMYADMIN_URL" --username root --password $TESTSUITE_PASSWORD $SERVER
+pytest -p no:cacheprovider -q --url "$PHPMYADMIN_URL" --username ${TESTSUITE_USER:=root} --password "$TESTSUITE_PASSWORD"  $SERVER $FILENAME
 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}"
+    echo "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: FAILED"
    exit $ret
 fi

-echo "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: ${GREEN}SUCCESS${NC}"
+echo "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: SUCCESS"
@@ -1,11 +0,0 @@
-[program:test-mariadb]
-command=/test-docker.sh test 80 mariadb
-autostart=true
-autorestart=false
-priority=3
-startretries=1
-stopwaitsecs=20
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
@@ -1,11 +0,0 @@
-[program:test-mysql]
-command=/test-docker.sh test 80 db_server
-autostart=true
-autorestart=false
-priority=3
-startretries=1
-stopwaitsecs=20
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
@@ -22,6 +22,7 @@ declare -A base=(
 )

 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"
@@ -30,6 +31,7 @@ for variant in apache fpm fpm-alpine; do
 	cp docker-entrypoint.sh "$variant/docker-entrypoint.sh"
 	sed -ri -e '
 		s/%%VERSION%%/'"$latest"'/;
+		s/%%SHA256%%/'"$sha256"'/;
 		s/%%VARIANT%%/'"$variant"'/;
 		s/%%CMD%%/'"${cmd[$variant]}"'/;
 	' "$variant/Dockerfile"
Author	SHA1	Message	Date
Isaac Bennetch	3d8c2ba403	Update to 5.1.0 release Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2021-02-24 01:44:19 -05:00
William Desportes	e09f731a32	Merge #324 - Add expose_php env back It was broken in #320 implementation	2021-02-07 22:02:42 +01:00
J0WI	d383a98040	Revert HIDE_PHP_VERSION removal	2021-02-07 21:25:36 +01:00
William Desportes	bd7de17631	Add MEMORY_LIMIT to allowed ENV names Added in #320 See: https://github.com/docker-library/official-images/pull/9426	2021-02-02 00:12:33 +01:00
William Desportes	49a7e0fba7	Make the new MEMORY_LIMIT ENV work for phpMyAdmin configs Added in #320 See: https://github.com/docker-library/official-images/pull/9426	2021-02-02 00:08:42 +01:00
William Desportes	b0beabb4ed	Add back HIDE_PHP_VERSION to Docker hub readme Removed in #320 by mistake See: https://github.com/docker-library/official-images/pull/9426	2021-02-02 00:05:26 +01:00
William Desportes	1a7be47268	Fix PMA_QUERYHISTORYMAX ENV in config.inc.php See: https://github.com/docker-library/official-images/pull/9426	2021-02-01 23:53:40 +01:00
William Desportes	8dc7e66dec	Merge #320 - Generate phpmyadmin-misc.ini from ENVs	2021-01-30 00:22:21 +01:00
William Desportes	d6ab5de683	Add a missed assertion on max_execution_time	2021-01-30 00:15:16 +01:00
J0WIandWilliam Desportes	e1bfab5583	Generate phpmyadmin-misc.ini from ENVs	2021-01-30 00:02:30 +01:00
William Desportes	3ba3be3492	Merge #322 - Add PMA_CONTROLPASS	2021-01-29 23:59:11 +01:00
William Desportes	4537d1869c	Merge #323 - Re work the test system	2021-01-29 23:58:01 +01:00
William Desportes	d7b3994b3a	Add a test for PMA_HOST	2021-01-29 23:52:24 +01:00
William Desportes	d91c4ba999	Clean old CI files	2021-01-29 23:00:38 +01:00
William Desportes	56fbf97a95	Add more tests for UPLOAD_LIMIT	2021-01-29 21:52:36 +01:00
William Desportes	71627ad719	Re-work the testing scripts	2021-01-29 21:12:55 +01:00
William Desportes	568e5ed308	Use healthcheck strategy for running tests	2021-01-29 14:14:08 +01:00
William Desportes	a4dd0817f0	Add a test for PMA_CONTROLPASS secret file	2021-01-28 22:50:06 +01:00
William Desportes	508c9b991c	Add PMA_CONTROLPASS to the README file	2021-01-28 22:49:22 +01:00
William Desportes	5d45c24548	Update different versions to add PMA_CONTROLPASS	2021-01-28 22:49:08 +01:00
William Desportes	4e6ed4b275	Update actions/checkout to v2	2021-01-28 22:46:14 +01:00
nicolas.clementz	d0f71fbf3b	Add PMA_CONTROLPASS to variables thas can be read from a file using _FILE	2021-01-28 11:56:40 +11:00
William Desportes	a66e868fd0	Merge #317 - Fix #309 QueryHistoryMax is an int	2020-12-31 11:08:11 +01:00
w3goodiesandGitHub	9322b7afdf	Update config.inc.php PMA_QUERYHISTORYMAX is integer value. Using boolval on it will either result in 1 or 0 for max query history.	2020-12-31 06:19:01 +03:00
William Desportes	0225133981	Merge #292 - Documentation fixes	2020-12-26 12:19:54 +01:00
William Desportes	d6da7ca981	Wording improvement	2020-12-26 12:19:09 +01:00
William Desportes	76b8d29695	Improvements and document #309	2020-12-26 12:15:33 +01:00
Isaac BennetchandWilliam Desportes	00ad857703	Document more ENV variables that were added with https://github.com/phpmyadmin/docker/pull/152/ Related to `85198de04f` and `93e2be73ec` Fixes #151 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2020-12-26 12:05:40 +01:00
Isaac BennetchandWilliam Desportes	b2edf5d8fd	Grammar fixes Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2020-12-26 12:05:10 +01:00
William Desportes	4b1fe4dc6f	Merge #314 - Add the possibility to change max_execution_time	2020-12-26 12:02:34 +01:00
William Desportes	a2b0f3a5c0	Merge #309 - Add PMA_QUERYHISTORYMAX config parameter	2020-12-26 12:01:05 +01:00
Dennis PaulandWilliam Desportes	a3a4c4e0fd	[+] ENV MAX_EXECUTION_TIME	2020-12-26 11:58:45 +01:00
William Desportes	06cc93a972	#313 - Drop Build Images from TravisCI	2020-12-26 11:53:10 +01:00
William Desportes	7f5e91546b	Merge #305 - Add 'max_input_vars = 10000' to phpmyadmin_misc.ini	2020-12-26 11:44:14 +01:00
William Desportes	7e3ee4e83c	Merge #313 - Add GitHub CI	2020-12-26 11:42:36 +01:00
William Desportes	1465223b65	Improve the README.md	2020-12-26 11:41:21 +01:00
J0WI	a8ab7d86e7	Add GitHub CI	2020-11-06 22:20:42 +01:00
Samuel Denis-D'OrtunandGitHub	5e1ea11678	Add PMA_QUERYHISTORYMAX config parameter	2020-10-16 23:10:58 -04:00
Isaac Bennetch	497becb0f2	Update to 5.0.4 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2020-10-15 18:51:26 -04:00
Isaac Bennetch	ba8ecc42f1	Update to 4.9.7 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2020-10-15 18:50:23 -04:00
Isaac Bennetch	3b0375d811	Release 5.0.3 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2020-10-10 00:18:15 -04:00
Isaac Bennetch	4f54fc3b46	Release 4.9.6 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2020-10-10 00:15:20 -04:00
slavik	af6cdca3b6	add 'max_input_vars = 10000' to phpmyadmin_misc.ini	2020-09-24 00:37:25 -07:00
William Desportes	785cd48c48	#268 - Add instructions to download bashbrew	2020-09-03 18:23:25 +02:00
William Desportes	301a7c4d18	Merge #268 - Update generate-stackbrew-library.sh	2020-09-03 18:07:59 +02:00
William Desportes	ad9f085601	Merge #303 - Fix docker hub tags page link	2020-09-03 18:07:16 +02:00
Thomas Dutrion GitHub William Desportes	ff56a56a29	Use the docker library path for tags page Co-authored-by: William Desportes <williamdes@wdes.fr>	2020-09-03 18:03:41 +02:00
Thomas DutrionandGitHub	e3b575ca8e	Fix docker hub tags page link Fix Docker hub tags page link in README	2020-09-03 17:35:54 +02:00
William Desportes	b9da1f2c54	Merge #301 - Update paths to image	2020-08-31 19:13:36 +02:00
J0WI	d00506237d	Update paths to image	2020-08-30 17:22:07 +02:00
William Desportes	39cec98bb5	Use fences for pseudo regex example of #297 Signed-off-by: William Desportes <williamdes@wdes.fr>	2020-07-31 23:47:13 +02:00
William Desportes	300ade5226	Merge #297 - Improve UPLOAD_LIMIT documentation	2020-07-31 23:44:12 +02:00
Thomas DecauxandGitHub	76651f53b3	Specify UPLOAD_LIMIT format Default value format "2048Kb" will not work with Apache !	2020-07-31 15:35:37 +02:00
William Desportes	9d66e78f8a	Merge #289 - Add SHA checksum when downloading a version Signed-off-by: William Desportes <williamdes@wdes.fr>	2020-06-01 10:57:51 +02:00
William Desportes	85a642d7b3	Make sha256 fetching more strict Signed-off-by: William Desportes <williamdes@wdes.fr>	2020-06-01 10:56:52 +02:00
J0WI	6e3aeb3adf	Update generate-stackbrew-library.sh	2020-05-16 03:07:45 +02:00
William Desportes	c0b2ac28f9	Merge #288 - Use same "latest" procedure as in update.sh Signed-off-by: William Desportes <williamdes@wdes.fr>	2020-05-09 17:46:43 +02:00
J0WI	52d6fe4caf	Use same "latest" procedure as in update.sh	2020-05-08 04:46:46 +02:00
J0WI	f464cf5a67	Add SHA checksum	2020-05-08 04:44:41 +02:00
William Desportes	d1f2dea243	Revert `490df186e5` This commit is no more needed because `27f6f7e5ae` fixed the tag process Signed-off-by: William Desportes <williamdes@wdes.fr>	2020-05-07 09:48:08 +02:00
William Desportes	27f6f7e5ae	Fix parsing each revision on generate-stackbrew-library.sh Signed-off-by: William Desportes <williamdes@wdes.fr>	2020-05-07 08:50:07 +02:00
William Desportes	490df186e5	Add each variant to the tag list Signed-off-by: William Desportes <williamdes@wdes.fr>	2020-05-07 08:49:31 +02:00
William Desportes	d826f3a721	Merge #286 - cleanup after review for #56 Partial revert of `6b63869f1c` Signed-off-by: William Desportes <williamdes@wdes.fr>	2020-05-07 08:30:07 +02:00
J0WI	12d40a0300	Cleanup according to review	2020-05-07 01:11:27 +02:00
William Desportes	48f16c0dde	Update files after #285 Ref: https://github.com/phpmyadmin/docker/pull/285#issuecomment-612213968	2020-04-18 18:05:28 +02:00
Isaac BennetchandGitHub	0dbbe66eb3	Merge pull request #285 from ibennetch/webroot Extract downloaded files directly to web root /var/www/html/	2020-04-18 11:30:12 -04:00
Isaac Bennetch	4d5c71ca6e	Extract downloaded files directly to web root /var/www/html/ Fixes #277 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2020-04-10 16:34:27 -04:00
Isaac BennetchandGitHub	459489d8c1	Merge pull request #283 from krufab/bugfix/281-added-tzdata-package #281 Added tzdata also to the template alpine file	2020-03-29 13:57:44 -04:00
Fabio Kruger	ac3c819a69	#281 Added tzdata also to the template alpine file Signed-off-by: Fabio Kruger <krufab@gmail.com>	2020-03-29 19:15:03 +02:00
Isaac BennetchandGitHub	34c0696109	Merge pull request #282 from krufab/bugfix/281-added-tzdata-package #281 Added tzdata package	2020-03-28 21:26:23 -04:00
Fabio Kruger	3a9dc863e2	#281 Added tzdata package Signed-off-by: Fabio Kruger <krufab@gmail.com>	2020-03-27 23:16:29 +01:00
Isaac Bennetch	6c9a35dc6e	Release 5.0.2 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2020-03-21 00:44:01 -04:00
William Desportes	26be7daa0c	Merge #275 - add some org.opencontainers.image.* labels Pull-request: #275	2020-03-17 21:41:24 +01:00
William Desportes	6b63869f1c	Add org.opencontainers.image.* labels Licence: https://github.com/phpmyadmin/phpmyadmin/blob/master/composer.json	2020-03-17 21:37:29 +01:00
William Desportes	a4071cd297	Merge #274 - apply some feedback from docker-library team Pull-request: #274	2020-03-17 20:15:46 +01:00
J0WI	e05baec603	Apply various minor enhancements	2020-03-17 18:16:01 +01:00
William Desportes	6cd68f9647	Fix generate-stackbrew-library.sh Maintainers format Signed-off-by: William Desportes <williamdes@wdes.fr>	2020-01-16 23:16:05 +01:00
William Desportes	48f555eb3d	Maintainer replacement I put my name here because Michal Čihař resigned from phpMyAdmin https://blog.cihar.com/archives/2019/05/29/spring-cleanup/ I hope this change is okay :) [ci skip] Signed-off-by: William Desportes <williamdes@wdes.fr>	2020-01-16 23:01:11 +01:00
Isaac Bennetch	8c9962be4f	Release 5.0.1 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2020-01-07 22:07:49 -05:00
Isaac Bennetch	30fea9d2f4	Add version 4.9.4 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2020-01-07 22:06:55 -05:00
Isaac Bennetch	c850d7ece9	Release 5.0.1 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2020-01-07 21:55:13 -05:00
Isaac Bennetch	8917fb7bc2	Update to phpMyAdmin release 5.0.0 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2020-01-01 22:22:25 -05:00
Isaac Bennetch	31f2bdd82c	Update to phpMyAdmin release 4.9.3 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2020-01-01 22:14:24 -05:00
Isaac Bennetch	6d26530177	Update to phpMyAdmin release 5.0.0 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2019-12-26 12:20:27 -05:00
William Desportes	5d4b4dec94	Merge #259 - Improve documentation of which Docker tags we offer Pull-request: #259 Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-26 17:10:42 +01:00
William Desportes	4f88748138	Improve README.md and add a link to the main repo [ci skip] Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-26 13:32:14 +01:00
William Desportes	b295aa6bf7	Improve README and fix PMA_HOSTS and PMA_HOST Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-26 13:27:08 +01:00
William Desportes	dd2ca51984	Update files after `2313c19aed` (#247 ) Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-26 13:21:11 +01:00
William Desportes	568e58cc53	Merge #247 - Implement *_FILE read ENV from file Pull-request: #247 Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-26 13:21:08 +01:00
Mandy SchoepandWilliam Desportes	60e766aa9e	Added support for PMA_HOST_FILE and PMA_HOSTS_FILE	2019-12-26 13:17:43 +01:00
Mandy SchoepandWilliam Desportes	05d5c516d3	Fix and improve test suite	2019-12-24 11:21:35 +01:00
Mandy SchoepandWilliam Desportes	2576eb2c26	Implement loading secrets from files	2019-12-24 11:21:06 +01:00
Mandy SchoepandWilliam Desportes	bf6422b6a6	Fix .gitignore, README.md and .travis.yml	2019-12-24 11:20:10 +01:00
William Desportes	8edcc52dfb	Implement #192 - override config using base64 encoded config in ENVs Closes: #192 Pull-request: #262 Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-24 11:13:18 +01:00
William Desportes	ed101c2f39	Merge #261 - code improvements and implement UPLOAD_LIMIT Ref: #238 Closes: #240 Closes: #239 Closes: #233 Closes: #189 Closes: #139 Closes: #241 Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-24 11:11:23 +01:00
Isaac Bennetch	fb5222a52c	Improve documentation of which Docker tags we offer; standardize this list and adjust Docker Hub to match. Closes #256, closes #231, closes #229, closes #214 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2019-12-23 21:01:26 -05:00
William Desportes	d147a455af	Remove a non existent use case Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-24 00:35:25 +01:00
William Desportes	4e2998a2c5	Fix README.md and add a comment Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-24 00:35:25 +01:00
William Desportes	44ab81b7cf	Implement upload limit as an ENV value Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-24 00:35:09 +01:00
William Desportes	4b236d823a	Fix README.md Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-24 00:34:46 +01:00
William Desportes	1eede2e6b4	Use PHP_INI_DIR from base image Ref: https://hub.docker.com/_/php	2019-12-24 00:34:46 +01:00
William Desportes	7cd2b5b46f	Use url.php since it is available on all versions Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-24 00:34:46 +01:00
William Desportes	62b73c11a9	Add .gitattributes file Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-24 00:34:46 +01:00
William Desportes	a309c96f6a	Use user and group for sessions Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-24 00:34:46 +01:00
William Desportes	78f64ee5ce	Add a new ENV Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-24 00:34:46 +01:00
Patrik KernstockandIsaac Bennetch	2313c19aed	Hide PHP version (#209 ) Add option to hide PHP version by adding `expose_php = Off` to `php.ini` for security reasons Co-authored-by: William Desportes <williamdes@wdes.fr>	2019-12-23 18:26:48 -05:00
William Desportes	7d8a3e5717	Improve README.md Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-12-23 14:26:33 +01:00
J0WIandIsaac Bennetch	b696c1f43d	Update to PHP 7.4 (#257 ) * Update to PHP 7.4	2019-12-20 02:50:31 -05:00
William Desportes	53a793568a	Merge #242 - drop opcache from cli actions Pull-request: #242 Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-11-30 18:48:28 +01:00
J0WI	43888414d6	Drop opcache from cli actions	2019-11-29 19:49:53 +01:00
Isaac Bennetch	0343ca5338	Update to phpMyAdmin release 4.9.2 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2019-11-23 07:11:36 -05:00