Fix snapshots download url

Issue #157 Signed-off-by: Michal Čihař <michal@cihar.com>
Remove signature checks for snapshot
2026-08-24 10:13:22 -05:00 · 2018-04-18 16:26:42 +02:00 · 2018-04-18 16:07:47 +02:00 · 2018-04-18 15:51:03 +02:00 · 2017-08-23 22:26:31 +02:00 · 2017-08-23 16:20:01 +02:00
38 changed files with 2376 additions and 1656 deletions
@@ -0,0 +1,7 @@
+.travis.yml
+docker-compose.yml
+docker-compose.testing.yml
+README.md
+LICENSE
+Makefile
+testing
@@ -1 +0,0 @@
-*.sql linguist-detectable=false
@@ -1,6 +1 @@
 config.secret.inc.php
-__pycache__
-.pytest_cache
-.vscode
-.history
-.venv
@@ -1,90 +1,45 @@
+dist: trusty
+
+sudo: required
+
 services:
  - docker

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

-stages:
-  - name: "Build images"
-  - name: "Test docker-compose"
-  - name: "Run tests in testing container"
+env:
+  matrix:
+    - DB=mysql:latest
+    - DB=mariadb:latest

 before_install:
  - export TESTSUITE_PASSWORD=`openssl rand -base64 30`
-  - docker run --name db_server -e MYSQL_ROOT_PASSWORD=$TESTSUITE_PASSWORD -v $PWD/testing/testing.cnf:/etc/mysql/conf.d/testing.cnf:ro -d $DB
+  - docker run --name db_server -e MYSQL_ROOT_PASSWORD=$TESTSUITE_PASSWORD -d $DB

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

-_helpers:
- &test-docker-compose
-  stage: "Test docker-compose"
-  script:
-    - docker-compose -f docker-compose.testing.yml up -d db_server
-    - docker-compose -f docker-compose.testing.yml up -d
-    - docker-compose exec phpmyadmin /test-docker.sh phpmyadmin_testing 80 phpmyadmin_testing_db
-    - docker-compose stop
- &test-apache-image
-  stage: "Run tests in testing container"
-  script:
-    # Build image
-    - docker build -t phpmyadmin apache
-    # Test for single database
-    - docker run --name testadmin -d --link db_server:db -p 9090:80 phpmyadmin
-    - ./testing/test-docker.sh testadmin 9090
-    # Test for single database using env
-    - docker run --name envadmin -d --link db_server:db2 -e PMA_HOST=db2 -p 6060:80 phpmyadmin
-    - ./testing/test-docker.sh envadmin 6060
-    # Test for arbitrary database
-    - docker run --name arbitraryadmin -d --link db_server:db3 -e PMA_ARBITRARY=1 -p 7070:80 phpmyadmin
-    - ./testing/test-docker.sh arbitraryadmin 7070 db3
-    # Test for arbitrary database with user config
-    - docker run --name userconfigadmin -d --link db_server:db3 -v `readlink -f ./testing/config.test.inc.php`:/etc/phpmyadmin/config.user.inc.php -p 7080:80 phpmyadmin
-    - ./testing/test-docker.sh userconfigadmin 7080 db3
- &test-docker-compose-db
-  stage: "Test docker-compose"
-  script:
-    - docker-compose -f docker-compose.yml -f docker-compose.db.yml up -d
-    - ./testing/test-docker.sh phpmyadmin 8080 db_server
-    - docker-compose stop
- &build-image
-  stage: "Build images"
-  before_install: skip
-  install: skip
-
-jobs:
-  include:
-    - <<: *test-docker-compose
-      name: "Run and stop container using testing docker-compose file for MariaDB"
-      env: DB=mariadb:latest
-    - <<: *test-docker-compose
-      name: "Run and stop container using testing docker-compose file for MySQL"
-      env: DB=mysql:latest
-    - <<: *test-docker-compose-db
-      name: "Run and stop container using db docker-compose file for MariaDB"
-      env: DB=mariadb:latest
-    - <<: *test-docker-compose-db
-      name: "Run and stop container using db docker-compose file for MySQL"
-      env: DB=mysql:latest
-    - <<: *build-image
-      name: "Apache amd64"
-      arch: amd64
-      script:
-      - docker build -t phpmyadmin apache
-    - <<: *build-image
-      name: "fpm amd64"
-      arch: amd64
-      script:
-      - docker build -t phpmyadmin fpm
-    - <<: *build-image
-      name: "fpm-alpine amd64"
-      arch: amd64
-      script:
-      - docker build -t phpmyadmin fpm-alpine
-    - <<: *test-apache-image
-      name: "Run testing for MariaDB"
-      env: DB=mariadb:latest
-    - <<: *test-apache-image
-      name: "Run testing for MySQL"
-      env: DB=mysql:latest
+script:
+  # Build image
+  - docker build -t phpmyadmin/phpmyadmin .
+  # Test for single database
+  - docker run --name testadmin -d --link db_server:db -p 9090:80 phpmyadmin/phpmyadmin
+  - ./testing/test-docker.sh testadmin 9090
+  # Test for single database using env
+  - docker run --name envadmin -d --link db_server:db2 -e PMA_HOST=db2 -p 6060:80 phpmyadmin/phpmyadmin
+  - ./testing/test-docker.sh envadmin 6060
+  # Test for arbitrary database
+  - docker run --name arbitraryadmin -d --link db_server:db3 -e PMA_ARBITRARY=1 -p 7070:80 phpmyadmin/phpmyadmin
+  - ./testing/test-docker.sh arbitraryadmin 7070 db3
+  # Test for arbitrary database with user config
+  - docker run --name userconfigadmin -d --link db_server:db3 -v `readlink -f ./testing/config.test.inc.php`:/etc/phpmyadmin/config.user.inc.php -p 7080:80 phpmyadmin/phpmyadmin
+  - ./testing/test-docker.sh userconfigadmin 7080 db3
+  # Test docker-compose
+  - docker-compose -f docker-compose.yml -f docker-compose.db.yml up -d
+  - ./testing/test-docker.sh phpmyadmin 8080 db_server
+  - docker-compose stop
+  # Run tests in testing container
+  - docker-compose -f docker-compose.testing.yml up -d phpmyadmin
+  - ./testing/wait-for-testing.sh
@@ -0,0 +1,64 @@
+FROM php:7.2-fpm-alpine
+
+RUN apk add --no-cache \
+    nginx \
+    supervisor
+
+# Install dependencies
+RUN set -ex; \
+    \
+    apk add --no-cache --virtual .build-deps \
+        bzip2-dev \
+        freetype-dev \
+        libjpeg-turbo-dev \
+        libpng-dev \
+        libwebp-dev \
+        libxpm-dev \
+    ; \
+    \
+    docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \
+    docker-php-ext-install bz2 gd mysqli opcache zip; \
+    \
+    runDeps="$( \
+        scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
+            | tr ',' '\n' \
+            | sort -u \
+            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+    )"; \
+    apk add --virtual .phpmyadmin-phpexts-rundeps $runDeps; \
+    apk del .build-deps
+
+# Copy configuration
+COPY etc /etc/
+
+# Copy main script
+COPY run.sh /run.sh
+RUN chmod u+rwx /run.sh
+
+# Calculate download URL
+ENV VERSION 4.8+snapshot
+ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.gz
+LABEL version=$VERSION
+
+# Download tarball, verify it using gpg and extract
+RUN set -ex; \
+    curl --output phpMyAdmin.tar.gz --location $URL; \
+    tar xzf phpMyAdmin.tar.gz; \
+    rm -f phpMyAdmin.tar.gz phpMyAdmin.tar.gz.asc; \
+    mv phpMyAdmin-$VERSION-all-languages /www; \
+    rm -rf /www/setup/ /www/examples/ /www/test/ /www/po/ /www/composer.json /www/RELEASE-DATE-$VERSION; \
+    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /www/libraries/vendor_config.php; \
+    chown -R root:nobody /www; \
+    find /www -type d -exec chmod 750 {} \; ; \
+    find /www -type f -exec chmod 640 {} \; 
+
+# Add directory for sessions to allow session persistence
+RUN mkdir /sessions \
+    && mkdir -p /www/tmp \
+    && chmod -R 777 /www/tmp
+
+# We expose phpMyAdmin on port 80
+EXPOSE 80
+
+ENTRYPOINT [ "/run.sh" ]
+CMD ["phpmyadmin"]
@@ -1,110 +0,0 @@
-FROM php:7.4-%%VARIANT%%
-
-# docker-entrypoint.sh dependencies
-RUN apk add --no-cache \
-    bash \
-    tzdata
-
-# Install dependencies
-RUN set -ex; \
-    \
-    apk add --no-cache --virtual .build-deps \
-        bzip2-dev \
-        freetype-dev \
-        libjpeg-turbo-dev \
-        libpng-dev \
-        libwebp-dev \
-        libxpm-dev \
-        libzip-dev \
-    ; \
-    \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
-    docker-php-ext-install -j "$(nproc)" \
-        bz2 \
-        gd \
-        mysqli \
-        opcache \
-        zip \
-    ; \
-    \
-    runDeps="$( \
-        scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
-            | tr ',' '\n' \
-            | sort -u \
-            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-    )"; \
-    apk add --virtual .phpmyadmin-phpexts-rundeps $runDeps; \
-    apk del --no-network .build-deps
-
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN set -ex; \
-    \
-    { \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=4000'; \
-        echo 'opcache.revalidate_freq=2'; \
-        echo 'opcache.fast_shutdown=1'; \
-    } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \
-    \
-    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > $PHP_INI_DIR/conf.d/session-strict.ini; \
-    \
-    { \
-        echo 'allow_url_fopen = Off'; \
-        echo 'max_execution_time = 600'; \
-        echo 'memory_limit = 512M'; \
-    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
-
-# Calculate download URL
-ENV VERSION %%VERSION%%
-ENV SHA256 %%SHA256%%
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
-
-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; \
-    apk add --no-cache --virtual .fetch-deps \
-        gnupg \
-    ; \
-    \
-    export GNUPGHOME="$(mktemp -d)"; \
-    export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
-    curl -fsSL -o phpMyAdmin.tar.xz $URL; \
-    curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \
-    echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \
-    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
-    gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \
-    tar -xf phpMyAdmin.tar.xz -C /var/www/html --strip-components=1; \
-    mkdir -p /var/www/html/tmp; \
-    chown www-data:www-data /var/www/html/tmp; \
-    gpgconf --kill all; \
-    rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
-    rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \
-    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
-    apk del --no-network .fetch-deps
-
-# Copy configuration
-COPY config.inc.php /etc/phpmyadmin/config.inc.php
-
-# Copy main script
-COPY docker-entrypoint.sh /docker-entrypoint.sh
-
-ENTRYPOINT [ "/docker-entrypoint.sh" ]
-CMD ["%%CMD%%"]
@@ -1,121 +0,0 @@
-FROM php:7.4-%%VARIANT%%
-
-# Install dependencies
-RUN set -ex; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        libbz2-dev \
-        libfreetype6-dev \
-        libjpeg-dev \
-        libpng-dev \
-        libwebp-dev \
-        libxpm-dev \
-        libzip-dev \
-    ; \
-    \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
-    docker-php-ext-install -j "$(nproc)" \
-        bz2 \
-        gd \
-        mysqli \
-        opcache \
-        zip \
-    ; \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
-        | sort -u \
-        | xargs -r dpkg-query -S \
-        | cut -d: -f1 \
-        | sort -u \
-        | xargs -rt apt-mark manual; \
-    \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
-
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN set -ex; \
-    \
-    { \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=4000'; \
-        echo 'opcache.revalidate_freq=2'; \
-        echo 'opcache.fast_shutdown=1'; \
-    } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \
-    \
-    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > $PHP_INI_DIR/conf.d/session-strict.ini; \
-    \
-    { \
-        echo 'allow_url_fopen = Off'; \
-        echo 'max_execution_time = 600'; \
-        echo 'memory_limit = 512M'; \
-    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
-
-# Calculate download URL
-ENV VERSION %%VERSION%%
-ENV SHA256 %%SHA256%%
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
-
-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; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        gnupg \
-        dirmngr \
-    ; \
-    \
-    export GNUPGHOME="$(mktemp -d)"; \
-    export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
-    curl -fsSL -o phpMyAdmin.tar.xz $URL; \
-    curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \
-    echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \
-    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
-    gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \
-    tar -xf phpMyAdmin.tar.xz -C /var/www/html --strip-components=1; \
-    mkdir -p /var/www/html/tmp; \
-    chown www-data:www-data /var/www/html/tmp; \
-    gpgconf --kill all; \
-    rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
-    rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \
-    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
-
-# Copy configuration
-COPY config.inc.php /etc/phpmyadmin/config.inc.php
-
-# Copy main script
-COPY docker-entrypoint.sh /docker-entrypoint.sh
-
-ENTRYPOINT [ "/docker-entrypoint.sh" ]
-CMD ["%%CMD%%"]
@@ -1,26 +1,18 @@
-DOCKER_REPO = phpmyadmin
+DOCKER_REPO = phpmyadmin/phpmyadmin

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

 all: build run logs

-build: build-apache build-fpm build-fpm-alpine
+build:
+	docker build -t ${DOCKER_REPO}:testing .

-build-apache:
-	docker build ${DOCKER_FLAGS} -t ${DOCKER_REPO}:testing apache
-
-build-fpm:
-	docker build ${DOCKER_FLAGS} -t ${DOCKER_REPO}:testing-fpm fpm
-
-build-fpm-alpine:
-	docker build ${DOCKER_FLAGS} -t ${DOCKER_REPO}:testing-fpm-alpine fpm-alpine
+build_nc:
+	docker build --no-cache=true -t ${DOCKER_REPO}:testing .

 run:
 	docker-compose -f docker-compose.testing.yml up -d

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

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

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

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


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

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

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

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

 ## Usage with linked server

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

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

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

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

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

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

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

 ## Adding Custom Configuration

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

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

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

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

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

 Please report any issues with the Docker container to https://github.com/phpmyadmin/docker/issues
-
-Please report any issues with phpMyAdmin to https://github.com/phpmyadmin/phpmyadmin/issues
@@ -1,121 +0,0 @@
-FROM php:7.4-apache
-
-# Install dependencies
-RUN set -ex; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        libbz2-dev \
-        libfreetype6-dev \
-        libjpeg-dev \
-        libpng-dev \
-        libwebp-dev \
-        libxpm-dev \
-        libzip-dev \
-    ; \
-    \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
-    docker-php-ext-install -j "$(nproc)" \
-        bz2 \
-        gd \
-        mysqli \
-        opcache \
-        zip \
-    ; \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
-        | sort -u \
-        | xargs -r dpkg-query -S \
-        | cut -d: -f1 \
-        | sort -u \
-        | xargs -rt apt-mark manual; \
-    \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
-
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN set -ex; \
-    \
-    { \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=4000'; \
-        echo 'opcache.revalidate_freq=2'; \
-        echo 'opcache.fast_shutdown=1'; \
-    } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \
-    \
-    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > $PHP_INI_DIR/conf.d/session-strict.ini; \
-    \
-    { \
-        echo 'allow_url_fopen = Off'; \
-        echo 'max_execution_time = 600'; \
-        echo 'memory_limit = 512M'; \
-    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
-
-# Calculate download URL
-ENV VERSION 5.0.3
-ENV SHA256 da689973b114c3957c386846a0cb8a9da33bc33ef90ab007cc130f4e5dd3ec8c
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
-
-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; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        gnupg \
-        dirmngr \
-    ; \
-    \
-    export GNUPGHOME="$(mktemp -d)"; \
-    export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
-    curl -fsSL -o phpMyAdmin.tar.xz $URL; \
-    curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \
-    echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \
-    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
-    gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \
-    tar -xf phpMyAdmin.tar.xz -C /var/www/html --strip-components=1; \
-    mkdir -p /var/www/html/tmp; \
-    chown www-data:www-data /var/www/html/tmp; \
-    gpgconf --kill all; \
-    rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
-    rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \
-    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
-
-# Copy configuration
-COPY config.inc.php /etc/phpmyadmin/config.inc.php
-
-# Copy main script
-COPY docker-entrypoint.sh /docker-entrypoint.sh
-
-ENTRYPOINT [ "/docker-entrypoint.sh" ]
-CMD ["apache2-foreground"]
@@ -1,55 +0,0 @@
-#!/bin/bash
-if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
-
-    if [ ! -f /etc/phpmyadmin/config.secret.inc.php ]; then
-        cat > /etc/phpmyadmin/config.secret.inc.php <<EOT
-<?php
-\$cfg['blowfish_secret'] = '$(tr -dc 'a-zA-Z0-9~!@#$%^&*_()+}{?></";.,[]=-' < /dev/urandom | fold -w 32 | head -n 1)';
-EOT
-    fi
-
-    if [ ! -f /etc/phpmyadmin/config.user.inc.php ]; then
-        touch /etc/phpmyadmin/config.user.inc.php
-    fi
-fi
-
-if [ ! -z "${HIDE_PHP_VERSION}" ]; then
-    echo "PHP version is now hidden."
-    echo -e 'expose_php = Off\n' > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini
-fi
-
-UPLOAD_LIMIT_INI_FILE="$PHP_INI_DIR/conf.d/phpmyadmin-upload-limit.ini"
-if [ ! -z "${UPLOAD_LIMIT}" ]; then
-    echo "Adding the custom upload limit."
-    echo -e "upload_max_filesize = $UPLOAD_LIMIT\npost_max_size = $UPLOAD_LIMIT\n" > $UPLOAD_LIMIT_INI_FILE
-fi
-
-if [ ! -z "${PMA_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.inc.php from base64."
-    echo "${PMA_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.inc.php
-fi
-
-if [ ! -z "${PMA_USER_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.user.inc.php from base64."
-    echo "${PMA_USER_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.user.inc.php
-fi
-
-get_docker_secret() {
-    local env_var="${1}"
-    local env_var_file="${env_var}_FILE"
-
-    # Check if the variable with name $env_var_file (which is $PMA_PASSWORD_FILE for example)
-    # is not empty and export $PMA_PASSWORD as the password in the Docker secrets file
-
-    if [[ -n "${!env_var_file}" ]]; then
-        export "${env_var}"="$(cat "${!env_var_file}")"
-    fi
-}
-
-get_docker_secret PMA_PASSWORD
-get_docker_secret MYSQL_ROOT_PASSWORD
-get_docker_secret MYSQL_PASSWORD
-get_docker_secret PMA_HOSTS
-get_docker_secret PMA_HOST
-
-exec "$@"
@@ -1,137 +0,0 @@
-<?php
-
-require('/etc/phpmyadmin/config.secret.inc.php');
-
-/* Ensure we got the environment */
-$vars = array(
-    'PMA_ARBITRARY',
-    'PMA_HOST',
-    'PMA_HOSTS',
-    'PMA_VERBOSE',
-    'PMA_VERBOSES',
-    'PMA_PORT',
-    'PMA_PORTS',
-    'PMA_SOCKET',
-    'PMA_SOCKETS',
-    'PMA_USER',
-    'PMA_PASSWORD',
-    'PMA_ABSOLUTE_URI',
-    'PMA_CONTROLHOST',
-    'PMA_CONTROLPORT',
-    'PMA_PMADB',
-    'PMA_CONTROLUSER',
-    'PMA_CONTROLPASS',
-    'PMA_QUERYHISTORYDB'
-);
-foreach ($vars as $var) {
-    $env = getenv($var);
-    if (!isset($_ENV[$var]) && $env !== false) {
-        $_ENV[$var] = $env;
-    }
-}
-if (isset($_ENV['PMA_QUERYHISTORYDB'])) {
-    $cfg['QueryHistoryDB'] = boolval($_ENV['PMA_QUERYHISTORYDB']);
-}
-
-/* Arbitrary server connection */
-if (isset($_ENV['PMA_ARBITRARY']) && $_ENV['PMA_ARBITRARY'] === '1') {
-    $cfg['AllowArbitraryServer'] = true;
-}
-
-/* Play nice behind reverse proxys */
-if (isset($_ENV['PMA_ABSOLUTE_URI'])) {
-    $cfg['PmaAbsoluteUri'] = trim($_ENV['PMA_ABSOLUTE_URI']);
-}
-
-/* Figure out hosts */
-
-/* Fallback to default linked */
-$hosts = array('db');
-
-/* Set by environment */
-if (!empty($_ENV['PMA_HOST'])) {
-    $hosts = array($_ENV['PMA_HOST']);
-    $verbose = array($_ENV['PMA_VERBOSE']);
-    $ports = array($_ENV['PMA_PORT']);
-} elseif (!empty($_ENV['PMA_HOSTS'])) {
-    $hosts = array_map('trim', explode(',', $_ENV['PMA_HOSTS']));
-    $verbose = array_map('trim', explode(',', $_ENV['PMA_VERBOSES']));
-    $ports = array_map('trim', explode(',', $_ENV['PMA_PORTS']));
-}
-if (!empty($_ENV['PMA_SOCKET'])) {
-    $sockets = array($_ENV['PMA_SOCKET']);
-} elseif (!empty($_ENV['PMA_SOCKETS'])) {
-    $sockets = explode(',', $_ENV['PMA_SOCKETS']);
-}
-
-/* Server settings */
-for ($i = 1; isset($hosts[$i - 1]); $i++) {
-    $cfg['Servers'][$i]['host'] = $hosts[$i - 1];
-    if (isset($verbose[$i - 1])) {
-        $cfg['Servers'][$i]['verbose'] = $verbose[$i - 1];
-    }
-    if (isset($ports[$i - 1])) {
-        $cfg['Servers'][$i]['port'] = $ports[$i - 1];
-    }
-    if (isset($_ENV['PMA_USER'])) {
-        $cfg['Servers'][$i]['auth_type'] = 'config';
-        $cfg['Servers'][$i]['user'] = $_ENV['PMA_USER'];
-        $cfg['Servers'][$i]['password'] = isset($_ENV['PMA_PASSWORD']) ? $_ENV['PMA_PASSWORD'] : '';
-    } else {
-        $cfg['Servers'][$i]['auth_type'] = 'cookie';
-    }
-    if (isset($_ENV['PMA_PMADB'])) {
-      $cfg['Servers'][$i]['pmadb'] = $_ENV['PMA_PMADB'];
-      $cfg['Servers'][$i]['relation'] = 'pma__relation';
-      $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
-      $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
-      $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
-      $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
-      $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
-      $cfg['Servers'][$i]['history'] = 'pma__history';
-      $cfg['Servers'][$i]['recent'] = 'pma__recent';
-      $cfg['Servers'][$i]['favorite'] = 'pma__favorite';
-      $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
-      $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
-      $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
-      $cfg['Servers'][$i]['users'] = 'pma__users';
-      $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
-      $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
-      $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
-      $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
-      $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
-      $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
-    }
-    if (isset($_ENV['PMA_CONTROLHOST'])) {
-      $cfg['Servers'][$i]['controlhost'] = $_ENV['PMA_CONTROLHOST'];
-    }
-    if (isset($_ENV['PMA_CONTROLPORT'])) {
-      $cfg['Servers'][$i]['controlport'] = $_ENV['PMA_CONTROLPORT'];
-    }
-    if (isset($_ENV['PMA_CONTROLUSER'])) {
-      $cfg['Servers'][$i]['controluser'] = $_ENV['PMA_CONTROLUSER'];
-    }
-    if (isset($_ENV['PMA_CONTROLPASS'])) {
-      $cfg['Servers'][$i]['controlpass'] = $_ENV['PMA_CONTROLPASS'];
-    }
-    $cfg['Servers'][$i]['compress'] = false;
-    $cfg['Servers'][$i]['AllowNoPassword'] = true;
-}
-for ($i = 1; isset($sockets[$i - 1]); $i++) {
-    $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];
-    $cfg['Servers'][$i]['host'] = 'localhost';
-}
-/*
- * Revert back to last configured server to make
- * it easier in config.user.inc.php
- */
-$i--;
-
-/* Uploads setup */
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-
-/* Include User Defined Settings Hook */
-if (file_exists('/etc/phpmyadmin/config.user.inc.php')) {
-    include('/etc/phpmyadmin/config.user.inc.php');
-}
@@ -1,15 +1,17 @@
-version: '3.1'
+version: '2'

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

  phpmyadmin:
    build:
@@ -17,14 +19,11 @@ services:
    container_name: phpmyadmin_testing
    volumes:
      - /sessions
-      - ./testing/conftest.py:/conftest.py
-      - ./testing/test-docker.sh:/test-docker.sh
-      - ./testing/phpmyadmin_test.py:/phpmyadmin_test.py
-      - ./docker-entrypoint.sh:/docker-entrypoint.sh
    ports:
      - 8090:80
    environment:
      - PMA_ARBITRARY=1
-      - TESTSUITE_PASSWORD=${TESTSUITE_PASSWORD:-my-secret-pw}
+      - TESTSUITE_PASSWORD=test123
    depends_on:
-      - db_server
+      - mariadb
+      - mysql
@@ -1,5 +1,5 @@
 phpmyadmin:
-    image: phpmyadmin
+    image: phpmyadmin/phpmyadmin
    container_name: phpmyadmin
    environment:
     - PMA_ARBITRARY=1
@@ -1,55 +0,0 @@
-#!/bin/bash
-if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
-
-    if [ ! -f /etc/phpmyadmin/config.secret.inc.php ]; then
-        cat > /etc/phpmyadmin/config.secret.inc.php <<EOT
-<?php
-\$cfg['blowfish_secret'] = '$(tr -dc 'a-zA-Z0-9~!@#$%^&*_()+}{?></";.,[]=-' < /dev/urandom | fold -w 32 | head -n 1)';
-EOT
-    fi
-
-    if [ ! -f /etc/phpmyadmin/config.user.inc.php ]; then
-        touch /etc/phpmyadmin/config.user.inc.php
-    fi
-fi
-
-if [ ! -z "${HIDE_PHP_VERSION}" ]; then
-    echo "PHP version is now hidden."
-    echo -e 'expose_php = Off\n' > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini
-fi
-
-UPLOAD_LIMIT_INI_FILE="$PHP_INI_DIR/conf.d/phpmyadmin-upload-limit.ini"
-if [ ! -z "${UPLOAD_LIMIT}" ]; then
-    echo "Adding the custom upload limit."
-    echo -e "upload_max_filesize = $UPLOAD_LIMIT\npost_max_size = $UPLOAD_LIMIT\n" > $UPLOAD_LIMIT_INI_FILE
-fi
-
-if [ ! -z "${PMA_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.inc.php from base64."
-    echo "${PMA_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.inc.php
-fi
-
-if [ ! -z "${PMA_USER_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.user.inc.php from base64."
-    echo "${PMA_USER_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.user.inc.php
-fi
-
-get_docker_secret() {
-    local env_var="${1}"
-    local env_var_file="${env_var}_FILE"
-
-    # Check if the variable with name $env_var_file (which is $PMA_PASSWORD_FILE for example)
-    # is not empty and export $PMA_PASSWORD as the password in the Docker secrets file
-
-    if [[ -n "${!env_var_file}" ]]; then
-        export "${env_var}"="$(cat "${!env_var_file}")"
-    fi
-}
-
-get_docker_secret PMA_PASSWORD
-get_docker_secret MYSQL_ROOT_PASSWORD
-get_docker_secret MYSQL_PASSWORD
-get_docker_secret PMA_HOSTS
-get_docker_secret PMA_HOST
-
-exec "$@"
@@ -0,0 +1,132 @@
+user nobody;
+worker_processes 4;
+
+daemon off;
+
+pid /nginx.pid;
+
+error_log /var/log/nginx-error.log;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    types {
+        text/html                             html htm shtml;
+        text/css                              css;
+        text/xml                              xml;
+        image/gif                             gif;
+        image/jpeg                            jpeg jpg;
+        application/javascript                js;
+        application/atom+xml                  atom;
+        application/rss+xml                   rss;
+    }
+
+    default_type application/octet-stream;
+
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+
+    client_body_timeout 12;
+    client_header_timeout 12;
+    keepalive_timeout 15;
+    send_timeout 10;
+    server_tokens off;
+
+    client_body_buffer_size 512K;
+    client_body_temp_path /var/nginx/client_body_temp;
+    client_header_buffer_size 16k;
+    client_max_body_size 512M;
+    large_client_header_buffers 4 8k;
+
+    gzip on;
+    gzip_comp_level 2;
+    gzip_min_length 1000;
+    gzip_proxied expired no-cache no-store private auth;
+    gzip_types text/plain application/x-javascript text/xml text/css application/xml;
+
+    access_log off;
+
+    server {
+        listen 80 default_server;
+        server_name _;
+
+        root /www;
+
+        index index.php index.html index.htm;
+
+        charset utf-8;
+
+        if ($request_method !~ ^(GET|HEAD|POST)$ ) {
+           return 405;
+        }
+
+        location / {
+            try_files $uri $uri/ =404;
+        }
+
+        location ~* .(jpg|jpeg|png|gif|ico|css|js)$ {
+            expires 365d;
+        }
+
+        location ~ \.php$ {
+            fastcgi_intercept_errors on;
+            fastcgi_pass unix:/var/run/php/php-fpm.sock;
+
+            # regex to split $uri to $fastcgi_script_name and $fastcgi_path
+            fastcgi_split_path_info ^(.+\.php)(/.+)$;
+
+            # Check that the PHP script exists before passing it
+            try_files $fastcgi_script_name =404;
+
+            # Bypass the fact that try_files resets $fastcgi_path_info
+            # see: https://trac.nginx.org/nginx/ticket/321
+            set $path_info $fastcgi_path_info;
+            fastcgi_param PATH_INFO $path_info;
+
+            fastcgi_read_timeout 1200;
+            fastcgi_buffering off;
+            fastcgi_buffers 16 16k;
+            fastcgi_buffer_size 32k;
+
+            fastcgi_index index.php;
+
+            fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+            fastcgi_param  QUERY_STRING       $query_string;
+            fastcgi_param  REQUEST_METHOD     $request_method;
+            fastcgi_param  CONTENT_TYPE       $content_type;
+            fastcgi_param  CONTENT_LENGTH     $content_length;
+
+            fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+            fastcgi_param  REQUEST_URI        $request_uri;
+            fastcgi_param  DOCUMENT_URI       $document_uri;
+            fastcgi_param  DOCUMENT_ROOT      $document_root;
+            fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+            fastcgi_param  REQUEST_SCHEME     $scheme;
+            fastcgi_param  HTTPS              $https if_not_empty;
+
+            fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
+            fastcgi_param  SERVER_SOFTWARE    nginx;
+
+            fastcgi_param  REMOTE_ADDR        $remote_addr;
+            fastcgi_param  REMOTE_PORT        $remote_port;
+            fastcgi_param  SERVER_ADDR        $server_addr;
+            fastcgi_param  SERVER_PORT        $server_port;
+            fastcgi_param  SERVER_NAME        $server_name;
+
+            # PHP only, required if PHP was built with --enable-force-cgi-redirect
+            fastcgi_param  REDIRECT_STATUS    200;
+        }
+
+        location ~ /\. {
+            deny  all;
+        }
+
+        location ~ /(libraries|templates) {
+            deny all;
+        }
+
+    }
+}
@@ -0,0 +1,17 @@
+[global]
+error_log = /var/log/php-fpm.log
+log_level = warning
+
+[www]
+user = nobody
+group = nobody
+listen = /var/run/php/php-fpm.sock
+listen.mode = 0660
+chdir = /www
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 2
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+catch_workers_output = Yes
+clear_env = No
@@ -11,8 +11,6 @@ $vars = array(
    'PMA_VERBOSES',
    'PMA_PORT',
    'PMA_PORTS',
-    'PMA_SOCKET',
-    'PMA_SOCKETS',
    'PMA_USER',
    'PMA_PASSWORD',
    'PMA_ABSOLUTE_URI',
@@ -54,14 +52,9 @@ if (!empty($_ENV['PMA_HOST'])) {
    $verbose = array($_ENV['PMA_VERBOSE']);
    $ports = array($_ENV['PMA_PORT']);
 } elseif (!empty($_ENV['PMA_HOSTS'])) {
-    $hosts = array_map('trim', explode(',', $_ENV['PMA_HOSTS']));
-    $verbose = array_map('trim', explode(',', $_ENV['PMA_VERBOSES']));
-    $ports = array_map('trim', explode(',', $_ENV['PMA_PORTS']));
-}
-if (!empty($_ENV['PMA_SOCKET'])) {
-    $sockets = array($_ENV['PMA_SOCKET']);
-} elseif (!empty($_ENV['PMA_SOCKETS'])) {
-    $sockets = explode(',', $_ENV['PMA_SOCKETS']);
+    $hosts = explode(',', $_ENV['PMA_HOSTS']);
+    $verbose = explode(',', $_ENV['PMA_VERBOSES']);
+    $ports = explode(',', $_ENV['PMA_PORTS']);
 }

 /* Server settings */
@@ -101,6 +94,8 @@ for ($i = 1; isset($hosts[$i - 1]); $i++) {
      $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
      $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
      $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
+      $cfg['Servers'][$i]['compress'] = false;
+      $cfg['Servers'][$i]['AllowNoPassword'] = true;
    }
    if (isset($_ENV['PMA_CONTROLHOST'])) {
      $cfg['Servers'][$i]['controlhost'] = $_ENV['PMA_CONTROLHOST'];
@@ -114,12 +109,6 @@ for ($i = 1; isset($hosts[$i - 1]); $i++) {
    if (isset($_ENV['PMA_CONTROLPASS'])) {
      $cfg['Servers'][$i]['controlpass'] = $_ENV['PMA_CONTROLPASS'];
    }
-    $cfg['Servers'][$i]['compress'] = false;
-    $cfg['Servers'][$i]['AllowNoPassword'] = true;
-}
-for ($i = 1; isset($sockets[$i - 1]); $i++) {
-    $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];
-    $cfg['Servers'][$i]['host'] = 'localhost';
 }
 /*
 * Revert back to last configured server to make
@@ -0,0 +1,12 @@
+[program:nginx]
+command=nginx -c /etc/nginx.conf
+autostart=true
+autorestart=true
+priority=2
+startretries=3
+stopwaitsecs=10
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
@@ -0,0 +1,13 @@
+[program:php-fpm]
+command=php-fpm --nodaemonize --fpm-config /etc/php-fpm.conf -c /etc/php.ini
+user=nobody
+autostart=true
+autorestart=true
+priority=1
+startretries=3
+stopwaitsecs=10
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
@@ -1,110 +0,0 @@
-FROM php:7.4-fpm-alpine
-
-# docker-entrypoint.sh dependencies
-RUN apk add --no-cache \
-    bash \
-    tzdata
-
-# Install dependencies
-RUN set -ex; \
-    \
-    apk add --no-cache --virtual .build-deps \
-        bzip2-dev \
-        freetype-dev \
-        libjpeg-turbo-dev \
-        libpng-dev \
-        libwebp-dev \
-        libxpm-dev \
-        libzip-dev \
-    ; \
-    \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
-    docker-php-ext-install -j "$(nproc)" \
-        bz2 \
-        gd \
-        mysqli \
-        opcache \
-        zip \
-    ; \
-    \
-    runDeps="$( \
-        scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
-            | tr ',' '\n' \
-            | sort -u \
-            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-    )"; \
-    apk add --virtual .phpmyadmin-phpexts-rundeps $runDeps; \
-    apk del --no-network .build-deps
-
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN set -ex; \
-    \
-    { \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=4000'; \
-        echo 'opcache.revalidate_freq=2'; \
-        echo 'opcache.fast_shutdown=1'; \
-    } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \
-    \
-    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > $PHP_INI_DIR/conf.d/session-strict.ini; \
-    \
-    { \
-        echo 'allow_url_fopen = Off'; \
-        echo 'max_execution_time = 600'; \
-        echo 'memory_limit = 512M'; \
-    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
-
-# Calculate download URL
-ENV VERSION 5.0.3
-ENV SHA256 da689973b114c3957c386846a0cb8a9da33bc33ef90ab007cc130f4e5dd3ec8c
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
-
-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; \
-    apk add --no-cache --virtual .fetch-deps \
-        gnupg \
-    ; \
-    \
-    export GNUPGHOME="$(mktemp -d)"; \
-    export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
-    curl -fsSL -o phpMyAdmin.tar.xz $URL; \
-    curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \
-    echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \
-    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
-    gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \
-    tar -xf phpMyAdmin.tar.xz -C /var/www/html --strip-components=1; \
-    mkdir -p /var/www/html/tmp; \
-    chown www-data:www-data /var/www/html/tmp; \
-    gpgconf --kill all; \
-    rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
-    rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \
-    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
-    apk del --no-network .fetch-deps
-
-# Copy configuration
-COPY config.inc.php /etc/phpmyadmin/config.inc.php
-
-# Copy main script
-COPY docker-entrypoint.sh /docker-entrypoint.sh
-
-ENTRYPOINT [ "/docker-entrypoint.sh" ]
-CMD ["php-fpm"]
@@ -1,137 +0,0 @@
-<?php
-
-require('/etc/phpmyadmin/config.secret.inc.php');
-
-/* Ensure we got the environment */
-$vars = array(
-    'PMA_ARBITRARY',
-    'PMA_HOST',
-    'PMA_HOSTS',
-    'PMA_VERBOSE',
-    'PMA_VERBOSES',
-    'PMA_PORT',
-    'PMA_PORTS',
-    'PMA_SOCKET',
-    'PMA_SOCKETS',
-    'PMA_USER',
-    'PMA_PASSWORD',
-    'PMA_ABSOLUTE_URI',
-    'PMA_CONTROLHOST',
-    'PMA_CONTROLPORT',
-    'PMA_PMADB',
-    'PMA_CONTROLUSER',
-    'PMA_CONTROLPASS',
-    'PMA_QUERYHISTORYDB'
-);
-foreach ($vars as $var) {
-    $env = getenv($var);
-    if (!isset($_ENV[$var]) && $env !== false) {
-        $_ENV[$var] = $env;
-    }
-}
-if (isset($_ENV['PMA_QUERYHISTORYDB'])) {
-    $cfg['QueryHistoryDB'] = boolval($_ENV['PMA_QUERYHISTORYDB']);
-}
-
-/* Arbitrary server connection */
-if (isset($_ENV['PMA_ARBITRARY']) && $_ENV['PMA_ARBITRARY'] === '1') {
-    $cfg['AllowArbitraryServer'] = true;
-}
-
-/* Play nice behind reverse proxys */
-if (isset($_ENV['PMA_ABSOLUTE_URI'])) {
-    $cfg['PmaAbsoluteUri'] = trim($_ENV['PMA_ABSOLUTE_URI']);
-}
-
-/* Figure out hosts */
-
-/* Fallback to default linked */
-$hosts = array('db');
-
-/* Set by environment */
-if (!empty($_ENV['PMA_HOST'])) {
-    $hosts = array($_ENV['PMA_HOST']);
-    $verbose = array($_ENV['PMA_VERBOSE']);
-    $ports = array($_ENV['PMA_PORT']);
-} elseif (!empty($_ENV['PMA_HOSTS'])) {
-    $hosts = array_map('trim', explode(',', $_ENV['PMA_HOSTS']));
-    $verbose = array_map('trim', explode(',', $_ENV['PMA_VERBOSES']));
-    $ports = array_map('trim', explode(',', $_ENV['PMA_PORTS']));
-}
-if (!empty($_ENV['PMA_SOCKET'])) {
-    $sockets = array($_ENV['PMA_SOCKET']);
-} elseif (!empty($_ENV['PMA_SOCKETS'])) {
-    $sockets = explode(',', $_ENV['PMA_SOCKETS']);
-}
-
-/* Server settings */
-for ($i = 1; isset($hosts[$i - 1]); $i++) {
-    $cfg['Servers'][$i]['host'] = $hosts[$i - 1];
-    if (isset($verbose[$i - 1])) {
-        $cfg['Servers'][$i]['verbose'] = $verbose[$i - 1];
-    }
-    if (isset($ports[$i - 1])) {
-        $cfg['Servers'][$i]['port'] = $ports[$i - 1];
-    }
-    if (isset($_ENV['PMA_USER'])) {
-        $cfg['Servers'][$i]['auth_type'] = 'config';
-        $cfg['Servers'][$i]['user'] = $_ENV['PMA_USER'];
-        $cfg['Servers'][$i]['password'] = isset($_ENV['PMA_PASSWORD']) ? $_ENV['PMA_PASSWORD'] : '';
-    } else {
-        $cfg['Servers'][$i]['auth_type'] = 'cookie';
-    }
-    if (isset($_ENV['PMA_PMADB'])) {
-      $cfg['Servers'][$i]['pmadb'] = $_ENV['PMA_PMADB'];
-      $cfg['Servers'][$i]['relation'] = 'pma__relation';
-      $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
-      $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
-      $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
-      $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
-      $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
-      $cfg['Servers'][$i]['history'] = 'pma__history';
-      $cfg['Servers'][$i]['recent'] = 'pma__recent';
-      $cfg['Servers'][$i]['favorite'] = 'pma__favorite';
-      $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
-      $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
-      $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
-      $cfg['Servers'][$i]['users'] = 'pma__users';
-      $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
-      $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
-      $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
-      $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
-      $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
-      $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
-    }
-    if (isset($_ENV['PMA_CONTROLHOST'])) {
-      $cfg['Servers'][$i]['controlhost'] = $_ENV['PMA_CONTROLHOST'];
-    }
-    if (isset($_ENV['PMA_CONTROLPORT'])) {
-      $cfg['Servers'][$i]['controlport'] = $_ENV['PMA_CONTROLPORT'];
-    }
-    if (isset($_ENV['PMA_CONTROLUSER'])) {
-      $cfg['Servers'][$i]['controluser'] = $_ENV['PMA_CONTROLUSER'];
-    }
-    if (isset($_ENV['PMA_CONTROLPASS'])) {
-      $cfg['Servers'][$i]['controlpass'] = $_ENV['PMA_CONTROLPASS'];
-    }
-    $cfg['Servers'][$i]['compress'] = false;
-    $cfg['Servers'][$i]['AllowNoPassword'] = true;
-}
-for ($i = 1; isset($sockets[$i - 1]); $i++) {
-    $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];
-    $cfg['Servers'][$i]['host'] = 'localhost';
-}
-/*
- * Revert back to last configured server to make
- * it easier in config.user.inc.php
- */
-$i--;
-
-/* Uploads setup */
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-
-/* Include User Defined Settings Hook */
-if (file_exists('/etc/phpmyadmin/config.user.inc.php')) {
-    include('/etc/phpmyadmin/config.user.inc.php');
-}
@@ -1,55 +0,0 @@
-#!/bin/bash
-if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
-
-    if [ ! -f /etc/phpmyadmin/config.secret.inc.php ]; then
-        cat > /etc/phpmyadmin/config.secret.inc.php <<EOT
-<?php
-\$cfg['blowfish_secret'] = '$(tr -dc 'a-zA-Z0-9~!@#$%^&*_()+}{?></";.,[]=-' < /dev/urandom | fold -w 32 | head -n 1)';
-EOT
-    fi
-
-    if [ ! -f /etc/phpmyadmin/config.user.inc.php ]; then
-        touch /etc/phpmyadmin/config.user.inc.php
-    fi
-fi
-
-if [ ! -z "${HIDE_PHP_VERSION}" ]; then
-    echo "PHP version is now hidden."
-    echo -e 'expose_php = Off\n' > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini
-fi
-
-UPLOAD_LIMIT_INI_FILE="$PHP_INI_DIR/conf.d/phpmyadmin-upload-limit.ini"
-if [ ! -z "${UPLOAD_LIMIT}" ]; then
-    echo "Adding the custom upload limit."
-    echo -e "upload_max_filesize = $UPLOAD_LIMIT\npost_max_size = $UPLOAD_LIMIT\n" > $UPLOAD_LIMIT_INI_FILE
-fi
-
-if [ ! -z "${PMA_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.inc.php from base64."
-    echo "${PMA_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.inc.php
-fi
-
-if [ ! -z "${PMA_USER_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.user.inc.php from base64."
-    echo "${PMA_USER_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.user.inc.php
-fi
-
-get_docker_secret() {
-    local env_var="${1}"
-    local env_var_file="${env_var}_FILE"
-
-    # Check if the variable with name $env_var_file (which is $PMA_PASSWORD_FILE for example)
-    # is not empty and export $PMA_PASSWORD as the password in the Docker secrets file
-
-    if [[ -n "${!env_var_file}" ]]; then
-        export "${env_var}"="$(cat "${!env_var_file}")"
-    fi
-}
-
-get_docker_secret PMA_PASSWORD
-get_docker_secret MYSQL_ROOT_PASSWORD
-get_docker_secret MYSQL_PASSWORD
-get_docker_secret PMA_HOSTS
-get_docker_secret PMA_HOST
-
-exec "$@"
@@ -1,121 +0,0 @@
-FROM php:7.4-fpm
-
-# Install dependencies
-RUN set -ex; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        libbz2-dev \
-        libfreetype6-dev \
-        libjpeg-dev \
-        libpng-dev \
-        libwebp-dev \
-        libxpm-dev \
-        libzip-dev \
-    ; \
-    \
-    docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \
-    docker-php-ext-install -j "$(nproc)" \
-        bz2 \
-        gd \
-        mysqli \
-        opcache \
-        zip \
-    ; \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
-        | sort -u \
-        | xargs -r dpkg-query -S \
-        | cut -d: -f1 \
-        | sort -u \
-        | xargs -rt apt-mark manual; \
-    \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
-
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN set -ex; \
-    \
-    { \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=4000'; \
-        echo 'opcache.revalidate_freq=2'; \
-        echo 'opcache.fast_shutdown=1'; \
-    } > $PHP_INI_DIR/conf.d/opcache-recommended.ini; \
-    \
-    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > $PHP_INI_DIR/conf.d/session-strict.ini; \
-    \
-    { \
-        echo 'allow_url_fopen = Off'; \
-        echo 'max_execution_time = 600'; \
-        echo 'memory_limit = 512M'; \
-    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
-
-# Calculate download URL
-ENV VERSION 5.0.3
-ENV SHA256 da689973b114c3957c386846a0cb8a9da33bc33ef90ab007cc130f4e5dd3ec8c
-ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
-
-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; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        gnupg \
-        dirmngr \
-    ; \
-    \
-    export GNUPGHOME="$(mktemp -d)"; \
-    export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
-    curl -fsSL -o phpMyAdmin.tar.xz $URL; \
-    curl -fsSL -o phpMyAdmin.tar.xz.asc $URL.asc; \
-    echo "$SHA256 *phpMyAdmin.tar.xz" | sha256sum -c -; \
-    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
-    gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \
-    tar -xf phpMyAdmin.tar.xz -C /var/www/html --strip-components=1; \
-    mkdir -p /var/www/html/tmp; \
-    chown www-data:www-data /var/www/html/tmp; \
-    gpgconf --kill all; \
-    rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
-    rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \
-    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
-
-# Copy configuration
-COPY config.inc.php /etc/phpmyadmin/config.inc.php
-
-# Copy main script
-COPY docker-entrypoint.sh /docker-entrypoint.sh
-
-ENTRYPOINT [ "/docker-entrypoint.sh" ]
-CMD ["php-fpm"]
@@ -1,137 +0,0 @@
-<?php
-
-require('/etc/phpmyadmin/config.secret.inc.php');
-
-/* Ensure we got the environment */
-$vars = array(
-    'PMA_ARBITRARY',
-    'PMA_HOST',
-    'PMA_HOSTS',
-    'PMA_VERBOSE',
-    'PMA_VERBOSES',
-    'PMA_PORT',
-    'PMA_PORTS',
-    'PMA_SOCKET',
-    'PMA_SOCKETS',
-    'PMA_USER',
-    'PMA_PASSWORD',
-    'PMA_ABSOLUTE_URI',
-    'PMA_CONTROLHOST',
-    'PMA_CONTROLPORT',
-    'PMA_PMADB',
-    'PMA_CONTROLUSER',
-    'PMA_CONTROLPASS',
-    'PMA_QUERYHISTORYDB'
-);
-foreach ($vars as $var) {
-    $env = getenv($var);
-    if (!isset($_ENV[$var]) && $env !== false) {
-        $_ENV[$var] = $env;
-    }
-}
-if (isset($_ENV['PMA_QUERYHISTORYDB'])) {
-    $cfg['QueryHistoryDB'] = boolval($_ENV['PMA_QUERYHISTORYDB']);
-}
-
-/* Arbitrary server connection */
-if (isset($_ENV['PMA_ARBITRARY']) && $_ENV['PMA_ARBITRARY'] === '1') {
-    $cfg['AllowArbitraryServer'] = true;
-}
-
-/* Play nice behind reverse proxys */
-if (isset($_ENV['PMA_ABSOLUTE_URI'])) {
-    $cfg['PmaAbsoluteUri'] = trim($_ENV['PMA_ABSOLUTE_URI']);
-}
-
-/* Figure out hosts */
-
-/* Fallback to default linked */
-$hosts = array('db');
-
-/* Set by environment */
-if (!empty($_ENV['PMA_HOST'])) {
-    $hosts = array($_ENV['PMA_HOST']);
-    $verbose = array($_ENV['PMA_VERBOSE']);
-    $ports = array($_ENV['PMA_PORT']);
-} elseif (!empty($_ENV['PMA_HOSTS'])) {
-    $hosts = array_map('trim', explode(',', $_ENV['PMA_HOSTS']));
-    $verbose = array_map('trim', explode(',', $_ENV['PMA_VERBOSES']));
-    $ports = array_map('trim', explode(',', $_ENV['PMA_PORTS']));
-}
-if (!empty($_ENV['PMA_SOCKET'])) {
-    $sockets = array($_ENV['PMA_SOCKET']);
-} elseif (!empty($_ENV['PMA_SOCKETS'])) {
-    $sockets = explode(',', $_ENV['PMA_SOCKETS']);
-}
-
-/* Server settings */
-for ($i = 1; isset($hosts[$i - 1]); $i++) {
-    $cfg['Servers'][$i]['host'] = $hosts[$i - 1];
-    if (isset($verbose[$i - 1])) {
-        $cfg['Servers'][$i]['verbose'] = $verbose[$i - 1];
-    }
-    if (isset($ports[$i - 1])) {
-        $cfg['Servers'][$i]['port'] = $ports[$i - 1];
-    }
-    if (isset($_ENV['PMA_USER'])) {
-        $cfg['Servers'][$i]['auth_type'] = 'config';
-        $cfg['Servers'][$i]['user'] = $_ENV['PMA_USER'];
-        $cfg['Servers'][$i]['password'] = isset($_ENV['PMA_PASSWORD']) ? $_ENV['PMA_PASSWORD'] : '';
-    } else {
-        $cfg['Servers'][$i]['auth_type'] = 'cookie';
-    }
-    if (isset($_ENV['PMA_PMADB'])) {
-      $cfg['Servers'][$i]['pmadb'] = $_ENV['PMA_PMADB'];
-      $cfg['Servers'][$i]['relation'] = 'pma__relation';
-      $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
-      $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
-      $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
-      $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
-      $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
-      $cfg['Servers'][$i]['history'] = 'pma__history';
-      $cfg['Servers'][$i]['recent'] = 'pma__recent';
-      $cfg['Servers'][$i]['favorite'] = 'pma__favorite';
-      $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
-      $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
-      $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
-      $cfg['Servers'][$i]['users'] = 'pma__users';
-      $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
-      $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
-      $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
-      $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
-      $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
-      $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
-    }
-    if (isset($_ENV['PMA_CONTROLHOST'])) {
-      $cfg['Servers'][$i]['controlhost'] = $_ENV['PMA_CONTROLHOST'];
-    }
-    if (isset($_ENV['PMA_CONTROLPORT'])) {
-      $cfg['Servers'][$i]['controlport'] = $_ENV['PMA_CONTROLPORT'];
-    }
-    if (isset($_ENV['PMA_CONTROLUSER'])) {
-      $cfg['Servers'][$i]['controluser'] = $_ENV['PMA_CONTROLUSER'];
-    }
-    if (isset($_ENV['PMA_CONTROLPASS'])) {
-      $cfg['Servers'][$i]['controlpass'] = $_ENV['PMA_CONTROLPASS'];
-    }
-    $cfg['Servers'][$i]['compress'] = false;
-    $cfg['Servers'][$i]['AllowNoPassword'] = true;
-}
-for ($i = 1; isset($sockets[$i - 1]); $i++) {
-    $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];
-    $cfg['Servers'][$i]['host'] = 'localhost';
-}
-/*
- * Revert back to last configured server to make
- * it easier in config.user.inc.php
- */
-$i--;
-
-/* Uploads setup */
-$cfg['UploadDir'] = '';
-$cfg['SaveDir'] = '';
-
-/* Include User Defined Settings Hook */
-if (file_exists('/etc/phpmyadmin/config.user.inc.php')) {
-    include('/etc/phpmyadmin/config.user.inc.php');
-}
@@ -1,55 +0,0 @@
-#!/bin/bash
-if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
-
-    if [ ! -f /etc/phpmyadmin/config.secret.inc.php ]; then
-        cat > /etc/phpmyadmin/config.secret.inc.php <<EOT
-<?php
-\$cfg['blowfish_secret'] = '$(tr -dc 'a-zA-Z0-9~!@#$%^&*_()+}{?></";.,[]=-' < /dev/urandom | fold -w 32 | head -n 1)';
-EOT
-    fi
-
-    if [ ! -f /etc/phpmyadmin/config.user.inc.php ]; then
-        touch /etc/phpmyadmin/config.user.inc.php
-    fi
-fi
-
-if [ ! -z "${HIDE_PHP_VERSION}" ]; then
-    echo "PHP version is now hidden."
-    echo -e 'expose_php = Off\n' > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini
-fi
-
-UPLOAD_LIMIT_INI_FILE="$PHP_INI_DIR/conf.d/phpmyadmin-upload-limit.ini"
-if [ ! -z "${UPLOAD_LIMIT}" ]; then
-    echo "Adding the custom upload limit."
-    echo -e "upload_max_filesize = $UPLOAD_LIMIT\npost_max_size = $UPLOAD_LIMIT\n" > $UPLOAD_LIMIT_INI_FILE
-fi
-
-if [ ! -z "${PMA_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.inc.php from base64."
-    echo "${PMA_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.inc.php
-fi
-
-if [ ! -z "${PMA_USER_CONFIG_BASE64}" ]; then
-    echo "Adding the custom config.user.inc.php from base64."
-    echo "${PMA_USER_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.user.inc.php
-fi
-
-get_docker_secret() {
-    local env_var="${1}"
-    local env_var_file="${env_var}_FILE"
-
-    # Check if the variable with name $env_var_file (which is $PMA_PASSWORD_FILE for example)
-    # is not empty and export $PMA_PASSWORD as the password in the Docker secrets file
-
-    if [[ -n "${!env_var_file}" ]]; then
-        export "${env_var}"="$(cat "${!env_var_file}")"
-    fi
-}
-
-get_docker_secret PMA_PASSWORD
-get_docker_secret MYSQL_ROOT_PASSWORD
-get_docker_secret MYSQL_PASSWORD
-get_docker_secret PMA_HOSTS
-get_docker_secret PMA_HOST
-
-exec "$@"
@@ -1,96 +0,0 @@
-#!/bin/bash
-set -e
-
-self="$(basename "$BASH_SOURCE")"
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-# Get the most recent commit which modified any of "$@".
-fileCommit() {
-	git log -1 --format='format:%H' HEAD -- "$@"
-}
-
-# Get the most recent commit which modified "$1/Dockerfile" or any file that
-# the Dockerfile copies into the rootfs (with COPY).
-dockerfileCommit() {
-	local dir="$1"; shift
-	(
-		cd "$dir";
-		fileCommit Dockerfile \
-			$(git show HEAD:./Dockerfile | awk '
-				toupper($1) == "COPY" {
-					for (i = 2; i < NF; i++)
-							print $i;
-				}
-			')
-	)
-}
-
-getArches() {
-	local repo="$1"; shift
-	local officialImagesUrl='https://github.com/docker-library/official-images/raw/master/library/'
-
-	eval "declare -g -A parentRepoToArches=( $(
-		find -name 'Dockerfile' -exec awk '
-				toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|microsoft\/[^:]+)(:|$)/ {
-					print "'"$officialImagesUrl"'" $2
-				}
-			' '{}' + \
-			| sort -u \
-			| xargs bashbrew cat --format '[{{ .RepoName }}:{{ .TagName }}]="{{ join " " .TagEntry.Architectures }}"'
-	) )"
-}
-
-if ! command -v bashbrew --version &> /dev/null
-then
-    echo "bashbrew could not be found"
-	echo "You can download it from Jenkins at https://github.com/docker-library/bashbrew#installing"
-    exit 1
-fi
-
-getArches 'phpmyadmin'
-
-# Header.
-cat <<-EOH
-# This file is generated via https://github.com/phpmyadmin/docker/blob/$(fileCommit "$self")/$self
-Maintainers: Isaac Bennetch <bennetch@gmail.com> (@ibennetch),
-             William Desportes <williamdes@wdes.fr> (@williamdes)
-GitRepo: https://github.com/phpmyadmin/docker.git
-EOH
-
-# prints "$2$1$3$1...$N"
-join() {
-	local sep="$1"; shift
-	local out; printf -v out "${sep//%/%%}%s" "$@"
-	echo "${out#$sep}"
-}
-
-latest="$(curl -fsSL 'https://www.phpmyadmin.net/home_page/version.json' | jq -r '.version')"
-
-for variant in apache fpm fpm-alpine; do
-	commit="$(dockerfileCommit "$variant")"
-	fullversion="$(git show "$commit":"$variant/Dockerfile" | awk '$1 == "ENV" && $2 == "VERSION" { print $3; exit }')"
-
-	versionAliases=( "$fullversion" "${fullversion%.*}" "${fullversion%.*.*}" )
-	if [ "$fullversion" = "$latest" ]; then
-		versionAliases+=( "latest" )
-	fi
-
-	variantAliases=( "${versionAliases[@]/%/-$variant}" )
-	variantAliases=( "${variantAliases[@]//latest-}" )
-
-	if [ "$variant" = "apache" ]; then
-		variantAliases+=( "${versionAliases[@]}" )
-	fi
-
-	variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$variant/Dockerfile")"
-
-	variantArches="${parentRepoToArches[$variantParent]}"
-
-	cat <<-EOE
-
-		Tags: $(join ', ' "${variantAliases[@]}")
-		Architectures: $(join ', ' $variantArches)
-		GitCommit: $commit
-		Directory: $variant
-	EOE
-done
@@ -1,4 +0,0 @@
-#!/bin/sh
-# This file is used by docker hub to build the image
-
-docker build -t $IMAGE_NAME .
@@ -0,0 +1,22 @@
+#!/bin/sh
+if [ ! -f /etc/phpmyadmin/config.secret.inc.php ] ; then
+    cat > /etc/phpmyadmin/config.secret.inc.php <<EOT
+<?php
+\$cfg['blowfish_secret'] = '$(tr -dc 'a-zA-Z0-9~!@#$%^&*_()+}{?></";.,[]=-' < /dev/urandom | fold -w 32 | head -n 1)';
+EOT
+fi
+
+if [ ! -f /etc/phpmyadmin/config.user.inc.php ] ; then
+  touch /etc/phpmyadmin/config.user.inc.php
+fi
+
+mkdir -p /var/nginx/client_body_temp
+chown nobody:nobody /sessions /var/nginx/client_body_temp
+mkdir -p /var/run/php/
+chown nobody:nobody /var/run/php/
+touch /var/log/php-fpm.log
+chown nobody:nobody /var/log/php-fpm.log
+
+if [ "$1" = 'phpmyadmin' ]; then
+    exec supervisord --nodaemon --configuration="/etc/supervisord.conf" --loglevel=info
+fi
@@ -1,17 +1,10 @@
 # Testing image for phpMyAdmin

-FROM phpmyadmin
+FROM phpmyadmin/phpmyadmin

 # Install test dependencies
-RUN set -ex; \
-	\
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		curl \
-		python-pip \
-	; \
-	pip install setuptools wheel; \
-	pip install mechanize html5lib pytest; \
-	rm -rf /var/lib/apt/lists/*
+RUN apk add --no-cache curl py2-pip
+RUN pip install mechanize html5lib

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

 import mechanize
-import tempfile
-import pytest


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

-def test_phpmyadmin(url, username, password, server, sqlfile):
+
+def test_phpmyadmin(url, username, password, server=None, sqlfile=None):
    if sqlfile is None:
        if os.path.exists('/world.sql'):
            sqlfile = '/world.sql'
        elif os.path.exists('./world.sql'):
            sqlfile = './world.sql'
        else:
-            path = os.path.dirname(os.path.realpath(__file__))
-            sqlfile = path + '/world.sql'
+            sqlfile = './testing/world.sql'
    br = mechanize.Browser()

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

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

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

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


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

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

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

-    # Run entrypoint and afterwards echo the environment variables
-    result = subprocess.Popen(dir_path+ "/../docker-entrypoint.sh 'env'", shell=True, stdout=subprocess.PIPE, env=test_env)
-    output = result.stdout.read().decode()
-
-    assert (env_name + "=" + password) in output
-
-def test_phpmyadmin_secrets():
-    docker_secret('MYSQL_PASSWORD')
-    docker_secret('MYSQL_ROOT_PASSWORD')
-    docker_secret('PMA_PASSWORD')
-    docker_secret('PMA_HOSTS')
-    docker_secret('PMA_HOST')
+if __name__ == '__main__':
+    main()
@@ -19,69 +19,74 @@ PHPMYADMIN_HOSTNAME=${TESTSUITE_HOSTNAME:=localhost}
 PHPMYADMIN_PORT=${TESTSUITE_PORT:=80}
 PHPMYADMIN_URL=http://$PHPMYADMIN_HOSTNAME:$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

-
-# Find test script
-if [ -f ./phpmyadmin_test.py ] ; then
-    FILENAME=./phpmyadmin_test.py
-else
-    FILENAME=./testing/phpmyadmin_test.py
-fi
-
+ret=0
 # Check if script is running inside container
-if ! [ -f /.dockerenv ] ; then
-    echo "Tests running outside container..."
-    COMMAND_HOST="docker exec ${NAME}"
-    docker ps -a
+if [ -f /.dockerenv ] ; then
+    echo "Tests running inside container..."
+
+    # Set database environment
+    PHPMYADMIN_DB_HOSTNAME=${PMA_HOST:=localhost}
+    PHPMYADMIN_DB_PORT=${PMA_PORT:=3306}
+    PHPMYADMIN_DB_URL=http://$PHPMYADMIN_DB_HOSTNAME:$PHPMYADMIN_DB_PORT/

    # Wait for database to start
    TIMEOUT=0
-    while [ $(docker logs db_server 2>&1 | fgrep -c "mysqld: ready for connections.") -le 0 ] ; do
+    while ! curl "$PHPMYADMIN_DB_URL" &>/dev/null; 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}
+            ret=1
            exit 1
        fi
    done
 else
-    echo "Tests running inside container..."
-    FILENAME=/phpmyadmin_test.py
+    echo "Tests running outside container..."
+    docker ps -a
+    COMMAND_HOST="docker exec ${NAME}"
 fi

+# Wait for container to start
+TIMEOUT=0
+while ! $COMMAND_HOST ps aux | grep -q nginx ; 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}"
+        ret=1
+        exit 1
+    fi
+done
+
 # Perform tests
-ret=0
-pytest -q --url "$PHPMYADMIN_URL" --username root --password "$TESTSUITE_PASSWORD"  $SERVER $FILENAME
-ret=$?
+if [ $ret -eq 0 ] ; then
+    if [ -f /phpmyadmin_test.py ] ; then
+        FILENAME=/phpmyadmin_test.py
+    elif [ -f ./phpmyadmin_test.py ] ; then
+        FILENAME=./phpmyadmin_test.py
+    else
+        FILENAME=./testing/phpmyadmin_test.py
+    fi
+    python $FILENAME --url "$PHPMYADMIN_URL" --username root --password $TESTSUITE_PASSWORD $SERVER
+    ret=$?
+fi

 # Show debug output in case of failure
 if [ $ret -ne 0 ] ; then
-    ${COMMAND_HOST} ps faux
+    curl "$PHPMYADMIN_URL"
+    $COMMAND_HOST ps faux
+    $COMMAND_HOST cat /var/log/php-fpm.log
+    $COMMAND_HOST cat /var/log/nginx-error.log
+    $COMMAND_HOST cat /var/log/supervisord.log
    echo "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: ${RED}FAILED${NC}"
    exit $ret
 fi
@@ -1,5 +1,5 @@
 [program:test-mysql]
-command=/test-docker.sh test 80 db_server
+command=/test-docker.sh test 80 mysql
 autostart=true
 autorestart=false
 priority=3
@@ -1,2 +0,0 @@
-[mysqld]
-default_authentication_plugin = mysql_native_password
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# Helper script to wait for testing inside container completes
+# Needs running docker-compose container based on docker-compose.testing.yml
+
+GREEN="\033[0;32m"
+RED="\033[0;31m"
+NC="\033[0m" # No Color
+
+TIMEOUT=0
+
+sleep 5
+
+while [ `docker-compose -f docker-compose.testing.yml logs phpmyadmin | grep -c 'Result of \(mysql\|mariadb\) tests'` -lt 2 ] ; do
+    sleep 1
+    TIMEOUT=$(($TIMEOUT + 1))
+    if [ $TIMEOUT -gt 20 ] ; then
+        docker-compose -f docker-compose.testing.yml logs phpmyadmin
+        echo "${RED}Timeout!${NC}"
+        exit 1
+    fi
+done
+
+if [ `docker-compose -f docker-compose.testing.yml logs phpmyadmin | grep -c 'Result of \(mysql\|mariadb\) tests.*SUCCESS'` -lt 2 ] ; then
+    docker-compose -f docker-compose.testing.yml logs phpmyadmin
+    echo "${RED}Failed${NC}"
+    exit 2
+fi
+
+docker-compose -f docker-compose.testing.yml logs phpmyadmin
+echo "${GREEN}Success${NC}"
+exit 0
@@ -1,38 +0,0 @@
-#!/bin/bash
-set -e
-
-# Check for dependencies
-command -v curl >/dev/null 2>&1 || { echo >&2 "'curl' is required but not found. Aborting."; exit 1; }
-command -v jq >/dev/null 2>&1 || { echo >&2 "'jq' is required but not found. Aborting."; exit 1; }
-if [ -z "${BASH_VERSINFO}" ] || [ -z "${BASH_VERSINFO[0]}" ] || [ ${BASH_VERSINFO[0]} -lt 4 ]; then
-  echo "BASH version 4.0 or greater is required. Aborting."
-  exit 1
-fi
-
-declare -A cmd=(
-	[apache]='apache2-foreground'
-	[fpm]='php-fpm'
-	[fpm-alpine]='php-fpm'
-)
-
-declare -A base=(
-	[apache]='debian'
-	[fpm]='debian'
-	[fpm-alpine]='alpine'
-)
-
-latest="$(curl -fsSL 'https://www.phpmyadmin.net/home_page/version.json' | jq -r '.version')"
-sha256="$(curl -fsSL "https://files.phpmyadmin.net/phpMyAdmin/$latest/phpMyAdmin-$latest-all-languages.tar.xz.sha256" | cut -f1 -d ' ' | tr -cd 'a-f0-9' | cut -c 1-64)"
-
-for variant in apache fpm fpm-alpine; do
-	template="Dockerfile-${base[$variant]}.template"
-	cp $template "$variant/Dockerfile"
-	cp config.inc.php "$variant/config.inc.php"
-	cp docker-entrypoint.sh "$variant/docker-entrypoint.sh"
-	sed -ri -e '
-		s/%%VERSION%%/'"$latest"'/;
-		s/%%SHA256%%/'"$sha256"'/;
-		s/%%VARIANT%%/'"$variant"'/;
-		s/%%CMD%%/'"${cmd[$variant]}"'/;
-	' "$variant/Dockerfile"
-done
Author	SHA1	Message	Date
Michal Čihař	8429260408	Fix snapshots download url Issue #157 Signed-off-by: Michal Čihař <michal@cihar.com>	2018-04-18 16:26:42 +02:00
Michal Čihař	2a32d39405	Remove signature checks for snapshot Signed-off-by: Michal Čihař <michal@cihar.com>	2018-04-18 16:07:47 +02:00
Michal Čihař	a82c421460	Merge branch 'master' into edge-4.8 See https://github.com/phpmyadmin/docker/issues/157 Signed-off-by: Michal Čihař <michal@cihar.com>	2018-04-18 15:51:03 +02:00
Michal Čihař	3e18501a5f	Revert "Remove no longer needed ctype dependency" This reverts commit `275b59e3dd`. It is needed for Twig. Signed-off-by: Michal Čihař <michal@cihar.com>	2017-08-23 22:26:31 +02:00
Michal Čihař	f88988d7a5	Merge branch 'master' into edge-4.8	2017-08-23 16:20:01 +02:00
Michal Čihař	11ad52edcd	Change to 4.8 snapshots Signed-off-by: Michal Čihař <michal@cihar.com>	2017-05-05 16:30:40 +02:00
Michal Čihař	a924c9da70	Remove pgp verification for snapshots They do not come with signatures Signed-off-by: Michal Čihař <michal@cihar.com>	2017-05-05 16:27:07 +02:00
Michal Čihař	174f145d54	Build 4.7 snapshot image Signed-off-by: Michal Čihař <michal@cihar.com>	2017-05-05 16:20:12 +02:00