Fix #372 - Support docker secrets from file for {PMA_USER,PMA_CONTROLUSER,PMA_CONTROLHOST}

- Support docker secrets from file for `PMA_USER`
- Support docker secrets from file for `PMA_CONTROLUSER`
- Support docker secrets from file for `PMA_CONTROLHOST`

CHANGELOG.md

@@ -8,6 +8,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Move docker-compose test files into a folder
 - Fix the section about E2E tests in `README.md`
+- Support docker secrets from file for `PMA_USER`
+- Support docker secrets from file for `PMA_CONTROLUSER`
+- Support docker secrets from file for `PMA_CONTROLHOST`
 
 ## [5.1.4] - 2022-05-11
 

README.md

@@ -173,11 +173,14 @@ docker run --name myadmin -d -e PMA_PASSWORD_FILE=/run/secrets/db_password.txt -
 
 #### Variables that can be read from a file using ``_FILE``
 
-- `PMA_PASSWORD`
 - `MYSQL_ROOT_PASSWORD`
 - `MYSQL_PASSWORD`
+- `PMA_USER`
+- `PMA_PASSWORD`
 - `PMA_HOSTS`
 - `PMA_HOST`
+- `PMA_CONTROLHOST`
+- `PMA_CONTROLUSER`
 - `PMA_CONTROLPASS`
 
 ## Run the E2E tests for this docker image

apache/docker-entrypoint.sh

@@ -40,11 +40,14 @@ get_docker_secret() {
     fi
 }
 
+get_docker_secret PMA_USER
 get_docker_secret PMA_PASSWORD
 get_docker_secret MYSQL_ROOT_PASSWORD
 get_docker_secret MYSQL_PASSWORD
 get_docker_secret PMA_HOSTS
 get_docker_secret PMA_HOST
+get_docker_secret PMA_CONTROLHOST
+get_docker_secret PMA_CONTROLUSER
 get_docker_secret PMA_CONTROLPASS
 
 exec "$@"

docker-entrypoint.sh

@@ -40,11 +40,14 @@ get_docker_secret() {
     fi
 }
 
+get_docker_secret PMA_USER
 get_docker_secret PMA_PASSWORD
 get_docker_secret MYSQL_ROOT_PASSWORD
 get_docker_secret MYSQL_PASSWORD
 get_docker_secret PMA_HOSTS
 get_docker_secret PMA_HOST
+get_docker_secret PMA_CONTROLHOST
+get_docker_secret PMA_CONTROLUSER
 get_docker_secret PMA_CONTROLPASS
 
 exec "$@"

fpm-alpine/docker-entrypoint.sh

@@ -40,11 +40,14 @@ get_docker_secret() {
     fi
 }
 
+get_docker_secret PMA_USER
 get_docker_secret PMA_PASSWORD
 get_docker_secret MYSQL_ROOT_PASSWORD
 get_docker_secret MYSQL_PASSWORD
 get_docker_secret PMA_HOSTS
 get_docker_secret PMA_HOST
+get_docker_secret PMA_CONTROLHOST
+get_docker_secret PMA_CONTROLUSER
 get_docker_secret PMA_CONTROLPASS
 
 exec "$@"

fpm/docker-entrypoint.sh

@@ -40,11 +40,14 @@ get_docker_secret() {
     fi
 }
 
+get_docker_secret PMA_USER
 get_docker_secret PMA_PASSWORD
 get_docker_secret MYSQL_ROOT_PASSWORD
 get_docker_secret MYSQL_PASSWORD
 get_docker_secret PMA_HOSTS
 get_docker_secret PMA_HOST
+get_docker_secret PMA_CONTROLHOST
+get_docker_secret PMA_CONTROLUSER
 get_docker_secret PMA_CONTROLPASS
 
 exec "$@"

testing/phpmyadmin_test.py

@@ -78,9 +78,12 @@ def docker_secret(env_name):
 def test_phpmyadmin_secrets():
     docker_secret('MYSQL_PASSWORD')
     docker_secret('MYSQL_ROOT_PASSWORD')
+    docker_secret('PMA_USER')
     docker_secret('PMA_PASSWORD')
     docker_secret('PMA_HOSTS')
     docker_secret('PMA_HOST')
+    docker_secret('PMA_CONTROLHOST')
+    docker_secret('PMA_CONTROLUSER')
     docker_secret('PMA_CONTROLPASS')