Update to 5.1.2 release

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
Fix #325 - Upgrade to PHP 8
2026-08-24 18:14:23 -05:00 · 2022-01-21 22:08:10 -05:00 · 2021-08-23 17:39:00 +02:00 · 2021-08-23 17:26:34 +02:00 · 2021-08-23 16:46:30 +02:00 · 2021-08-13 02:59:02 +02:00
7 changed files with 145 additions and 74 deletions
@@ -0,0 +1,54 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+
+## [Unreleased] - YYYY-MM-DD
+
+- Fix GPG keyservers in Dockerfiles
+- Remove microbadger badges, it closed
+- Improve the README file
+- Fix add back composer.json and remove non needed source files (#345)
+- Update to PHP 8.0 (#325)
+
+## [5.1.1] - 2021-06-04
+
+- Improve documentation
+
+## [5.1.0] - 2021-02-24
+
+- Set ini setting `max_input_vars = 10000`
+- Add support for ENV `PMA_QUERYHISTORYMAX`
+- Add support for ENV `MAX_EXECUTION_TIME`
+- Move to GitHub actions
+- Re-work the test system
+- Support docker secrets from file for `PMA_CONTROLPASS`
+- Generate phpmyadmin-misc.ini from ENVs
+
+## [4.9.{6,7}] - 2020-10-{10,16} and [5.0.{3,4}] - 2020-10-{10,16}
+
+- Add `tzdata` package
+- Extract downloaded files directly to web root `/var/www/html/` (#277)
+- Add SHA checksum when downloading a version
+- Improved `UPLOAD_LIMIT` documentation
+- Update documentation from `phpmyadmin/phpmyadmin` to `phpmyadmin`
+- `phpmyadmin` is now the official image in the Docker official library
+
+## [5.0.2] - 2020-03-21
+
+- Add org.opencontainers.image.* labels
+- Apply some feedback from docker-library team to Dockerfiles
+
+## [4.9.3] - 2020-01-02 and [5.0.0] - 2019-12-26
+
+- Add support for ENV `HIDE_PHP_VERSION` to set ini setting `expose_php = Off`
+- Add support for ENV `UPLOAD_LIMIT` to set `upload_max_filesize` and `post_max_size` ini settings
+- Add support for ENVs `PMA_CONFIG_BASE64` and `PMA_USER_CONFIG_BASE64` (#192)
+- Support docker secrets from files for `PMA_PASSWORD`, `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD`
+- Support docker secrets from files for `PMA_HOSTS` and `PMA_HOST`
+
+## [4.9.2-2] - 2020-12-20
+
+- Update to PHP 7.4 (#257)
+- Drop ini setting `opcache.enable_cli=1`
@@ -1,4 +1,4 @@
-FROM php:7.4-%%VARIANT%%
+FROM php:8.0-%%VARIANT%%

 # docker-entrypoint.sh dependencies
 RUN apk add --no-cache \
@@ -91,18 +91,17 @@ RUN set -ex; \
    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 keyserver.ubuntu.com --recv-keys "$GPGKEY" \
        || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
+        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY" \
+        || gpg --batch --keyserver keys.openpgp.org --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; \
+    rm -r -v /var/www/html/setup/ /var/www/html/examples/ /var/www/html/js/src/ /var/www/html/templates/test/ /var/www/html/babel.config.json /var/www/html/doc/html/_sources/ /var/www/html/RELEASE-DATE-$VERSION /var/www/html/CONTRIBUTING.md; \
    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
    apk del --no-network .fetch-deps

@@ -1,4 +1,4 @@
-FROM php:7.4-%%VARIANT%%
+FROM php:8.0-%%VARIANT%%

 # Install dependencies
 RUN set -ex; \
@@ -98,18 +98,17 @@ RUN set -ex; \
    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 keyserver.ubuntu.com --recv-keys "$GPGKEY" \
        || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
+        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY" \
+        || gpg --batch --keyserver keys.openpgp.org --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; \
+    rm -r -v /var/www/html/setup/ /var/www/html/examples/ /var/www/html/js/src/ /var/www/html/templates/test/ /var/www/html/babel.config.json /var/www/html/doc/html/_sources/ /var/www/html/RELEASE-DATE-$VERSION /var/www/html/CONTRIBUTING.md; \
    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
    \
    apt-mark auto '.*' > /dev/null; \
@@ -1,5 +1,9 @@
 # Official phpMyAdmin Docker image

+Note that since phpMyAdmin has been accepted in to the [official DockerHub repository](https://hub.docker.com/_/phpmyadmin), you can use
+either that or this older [phpMyAdmin repository](https://hub.docker.com/r/phpmyadmin/phpmyadmin/) for your Docker installation. This
+is maintained as a courtesy to users who have not migrated.
+
 Run phpMyAdmin with Alpine, Apache and PHP FPM.

 [![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)
@@ -15,21 +19,16 @@ Run phpMyAdmin with Alpine, Apache and PHP FPM.
 [![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`
+All of the following examples will bring you phpMyAdmin on `http://localhost:8080`
 where you can enjoy your happy MySQL administration.

 ## Credentials

-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.
+phpMyAdmin connects using your MySQL server credentials. Please check your corresponding
+database server image for information on the default username and password or how to specify your own custom credentials during installation.

-The official MySQL and MariaDB use the following environment variables to define these:
+The official MySQL and MariaDB images 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.
@@ -41,7 +40,7 @@ The following tags are available:
 * `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`
+* Specific patch versions, such as `5.0.0`, `5.0.0-fpm`, and `5.0.0-alpine`.  Note that, on rare occasion, there may be an intermediary "docker-only" release, such as 4.9.2-1

 A complete list of tags is [available at Docker Hub](https://hub.docker.com/_/phpmyadmin?tab=tags)

@@ -51,10 +50,10 @@ 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.
+* "fpm" only starts a PHP FPM container. Use this variant if you already have a separate 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.
+Use this variant if you already have a separate webserver. If you need more tools that are not available on Alpine Linux, use the fpm image instead.

 ## Usage with linked server

@@ -68,7 +67,7 @@ docker run --name myadmin -d --link mysql_db_server:db -p 8080:80 phpmyadmin
 ## Usage with external server

 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:
+use `PMA_PORT` to specify the port of the server in case it's not the default one:

 ```sh
 docker run --name myadmin -d -e PMA_HOST=dbhost -p 8080:80 phpmyadmin
@@ -76,7 +75,7 @@ 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:
+You can use arbitrary servers by adding the environment variable `PMA_ARBITRARY=1` to the startup command:

 ```sh
 docker run --name myadmin -d -e PMA_ARBITRARY=1 -p 8080:80 phpmyadmin
@@ -84,46 +83,60 @@ docker run --name myadmin -d -e PMA_ARBITRARY=1 -p 8080:80 phpmyadmin

 ## Usage with docker-compose and arbitrary server

-This will run phpMyAdmin with arbitrary server - allowing you to specify MySQL/MariaDB
-server on login page.
+This will run phpMyAdmin with the arbitrary server option - allowing you to specify any MySQL/MariaDB
+server on the login page.

-Using the docker-compose.yml from https://github.com/phpmyadmin/docker
+```yaml
+version: '3.1'

-```sh
-docker-compose up -d
-```
+services:
+  db:
+    image: mariadb:10.3
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: notSecureChangeMe

-## Run the E2E tests with docker-compose
-
-You can run the E2E tests with the local test environment by running MariaDB/MySQL databases. Adding ENV variable `PHPMYADMIN_RUN_TEST=true` already added on docker-compose file. Simply run:
-
-Using the docker-compose.testing.yml from https://github.com/phpmyadmin/docker
-
-```sh
-docker-compose -f docker-compose.testing.yml up phpmyadmin
+  phpmyadmin:
+    image: phpmyadmin
+    restart: always
+    ports:
+      - 8080:80
+    environment:
+      - PMA_ARBITRARY=1
 ```

 ## 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
+ 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:
+On the `docker run` line like this:

 ```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.
-https://docs.phpmyadmin.net/en/latest/config.html#config
-https://docs.phpmyadmin.net/en/latest/setup.html
+Be sure to have `<?php` as your first line of the configuration file or the contents will not be detected as PHP code.

-## Usage behind reverse proxys
+Example:
+
+```php
+<?php
+
+$cfg['ShowPhpInfo'] = true; // Adds a link to phpinfo() on the home page
+```
+
+See the following links for config file information:
+
+* https://docs.phpmyadmin.net/en/latest/config.html#config
+* https://docs.phpmyadmin.net/en/latest/setup.html
+
+## Usage behind a reverse proxy

 Set the variable ``PMA_ABSOLUTE_URI`` to the fully-qualified path (``https://pma.example.net/``) where the reverse proxy makes phpMyAdmin available.

@@ -136,11 +149,10 @@ Set the variable ``PMA_ABSOLUTE_URI`` to the fully-qualified path (``https://pma
 * ``PMA_HOSTS`` - define comma separated list of address/host names of the MySQL servers
 * ``PMA_VERBOSES`` - define comma separated list of verbose names of the MySQL servers
 * ``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_USER`` and ``PMA_PASSWORD`` - define username and password to use only with the `config` authentication method
+* ``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_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`
@@ -149,7 +161,7 @@ Set the variable ``PMA_ABSOLUTE_URI`` to the fully-qualified path (``https://pma
 * ``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)`)
+* ``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)` where K is for Kilobytes, M for Megabytes, G for Gigabytes and 1K = 1024 bytes)
 * ``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`).

@@ -168,6 +180,16 @@ docker run --name myadmin -d -e PMA_PASSWORD_FILE=/run/secrets/db_password.txt -
 - `PMA_HOST`
 - `PMA_CONTROLPASS`

+## Run the E2E tests with docker-compose
+
+You can run the E2E tests with the local test environment by running MariaDB/MySQL databases. Adding ENV variable `PHPMYADMIN_RUN_TEST=true` already added on docker-compose file. Simply run:
+
+Using the docker-compose.testing.yml from https://github.com/phpmyadmin/docker
+
+```sh
+docker-compose -f docker-compose.testing.yml up phpmyadmin
+```
+
 For more detailed documentation see https://docs.phpmyadmin.net/en/latest/setup.html#installing-using-docker

 [hub]: https://hub.docker.com/_/phpmyadmin
@@ -1,4 +1,4 @@
-FROM php:7.4-apache
+FROM php:8.0-apache

 # Install dependencies
 RUN set -ex; \
@@ -68,8 +68,8 @@ RUN set -ex; \
    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini

 # Calculate download URL
-ENV VERSION 5.1.0
-ENV SHA256 aa8ccf357f672012384df34e1c2bc70147476761c8458a0dad6233497e142c68
+ENV VERSION 5.1.2
+ENV SHA256 3aaaa86ded6308f511f67a907c0d7d6096e1dc2a8ae05581ba55a2510abde1e4
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz

 LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
@@ -98,18 +98,17 @@ RUN set -ex; \
    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 keyserver.ubuntu.com --recv-keys "$GPGKEY" \
        || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
+        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY" \
+        || gpg --batch --keyserver keys.openpgp.org --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; \
+    rm -r -v /var/www/html/setup/ /var/www/html/examples/ /var/www/html/js/src/ /var/www/html/templates/test/ /var/www/html/babel.config.json /var/www/html/doc/html/_sources/ /var/www/html/RELEASE-DATE-$VERSION /var/www/html/CONTRIBUTING.md; \
    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
    \
    apt-mark auto '.*' > /dev/null; \
@@ -1,4 +1,4 @@
-FROM php:7.4-fpm-alpine
+FROM php:8.0-fpm-alpine

 # docker-entrypoint.sh dependencies
 RUN apk add --no-cache \
@@ -66,8 +66,8 @@ RUN set -ex; \
    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini

 # Calculate download URL
-ENV VERSION 5.1.0
-ENV SHA256 aa8ccf357f672012384df34e1c2bc70147476761c8458a0dad6233497e142c68
+ENV VERSION 5.1.2
+ENV SHA256 3aaaa86ded6308f511f67a907c0d7d6096e1dc2a8ae05581ba55a2510abde1e4
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz

 LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
@@ -91,18 +91,17 @@ RUN set -ex; \
    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 keyserver.ubuntu.com --recv-keys "$GPGKEY" \
        || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
+        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY" \
+        || gpg --batch --keyserver keys.openpgp.org --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; \
+    rm -r -v /var/www/html/setup/ /var/www/html/examples/ /var/www/html/js/src/ /var/www/html/templates/test/ /var/www/html/babel.config.json /var/www/html/doc/html/_sources/ /var/www/html/RELEASE-DATE-$VERSION /var/www/html/CONTRIBUTING.md; \
    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
    apk del --no-network .fetch-deps

@@ -1,4 +1,4 @@
-FROM php:7.4-fpm
+FROM php:8.0-fpm

 # Install dependencies
 RUN set -ex; \
@@ -68,8 +68,8 @@ RUN set -ex; \
    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini

 # Calculate download URL
-ENV VERSION 5.1.0
-ENV SHA256 aa8ccf357f672012384df34e1c2bc70147476761c8458a0dad6233497e142c68
+ENV VERSION 5.1.2
+ENV SHA256 3aaaa86ded6308f511f67a907c0d7d6096e1dc2a8ae05581ba55a2510abde1e4
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz

 LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
@@ -98,18 +98,17 @@ RUN set -ex; \
    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 keyserver.ubuntu.com --recv-keys "$GPGKEY" \
        || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
-        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
+        || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY" \
+        || gpg --batch --keyserver keys.openpgp.org --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; \
+    rm -r -v /var/www/html/setup/ /var/www/html/examples/ /var/www/html/js/src/ /var/www/html/templates/test/ /var/www/html/babel.config.json /var/www/html/doc/html/_sources/ /var/www/html/RELEASE-DATE-$VERSION /var/www/html/CONTRIBUTING.md; \
    sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
    \
    apt-mark auto '.*' > /dev/null; \
Author	SHA1	Message	Date
Isaac Bennetch	4dd05de348	Update to 5.1.2 release Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2022-01-21 22:08:10 -05:00
William Desportes	7c28533a32	Fix #325 - Upgrade to PHP 8	2021-08-23 17:39:00 +02:00
William Desportes	056d2b51fd	Write CHANGELOG entries since 4.9.2	2021-08-23 17:26:34 +02:00
William Desportes	030928a01e	Fix #345 - Add back composer.json and remove non needed source files	2021-08-23 16:46:30 +02:00
William Desportes	a73a82a790	Change the tags list link to the official image	2021-08-13 02:59:02 +02:00
William Desportes	0f4250dc7f	Move test section to the end I bet most users to not care about it	2021-08-13 02:55:48 +02:00
William Desportes	17b7a91289	Add a warning and example on the README Ref: #338 Ref: #342	2021-08-13 02:53:23 +02:00
William Desportes	886f7ae6e3	Fix yaml format fence on the README	2021-08-13 02:47:32 +02:00
William Desportes	1655371fb0	Remove microbadger, it has shutdown	2021-08-13 02:45:41 +02:00
William Desportes	60c187d10d	Add some format details from the PHP FAQ Closes: #328	2021-08-13 02:42:49 +02:00
William Desportes	3dafd123f8	Merge #341 - Fix GPG keyservers	2021-08-13 01:43:47 +02:00
Daniel Rudolf	e8ade8e3b1	Follow-up: GPG: Fix GPG keyservers Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>	2021-08-11 20:25:33 +02:00
Daniel Rudolf	12e6fdf738	GPG: Fix GPG keyservers sks-keyservers.net was shut down some time ago. keys.gnupg.net is just an alias. Neither pgp.mit.edu, nor keyserver.pgp.com are available right now, but there was no take-down notice, so we should assume they are temporarily unavailable. Use keys.openpgp.org as main alternative. Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>	2021-08-11 18:49:58 +02:00
Isaac Bennetch	935605b8d0	Update to 5.1.1 release Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2021-06-04 00:45:29 -04:00
Isaac Bennetch	4482d47ca7	Improve documentation Add some missing information, fix typos, restructure, and improve readability Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2021-03-17 21:22:05 -04:00