From 0b7054a449f7743922c215e1eb5c32dc1d643974 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 19 Jun 2022 19:47:49 +0200
Subject: [PATCH] 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                    | 3 +++
 README.md                       | 5 ++++-
 apache/docker-entrypoint.sh     | 3 +++
 docker-entrypoint.sh            | 3 +++
 fpm-alpine/docker-entrypoint.sh | 3 +++
 fpm/docker-entrypoint.sh        | 3 +++
 testing/phpmyadmin_test.py      | 3 +++
 7 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ceacd7..b6a5b30 100644
--- a/CHANGELOG.md
+++ b/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
 
diff --git a/README.md b/README.md
index bd37d40..ffb665c 100644
--- a/README.md
+++ b/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
diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
index 601cdbe..968b1d7 100755
--- a/apache/docker-entrypoint.sh
+++ b/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 "$@"
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 601cdbe..968b1d7 100755
--- a/docker-entrypoint.sh
+++ b/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 "$@"
diff --git a/fpm-alpine/docker-entrypoint.sh b/fpm-alpine/docker-entrypoint.sh
index 601cdbe..968b1d7 100755
--- a/fpm-alpine/docker-entrypoint.sh
+++ b/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 "$@"
diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
index 601cdbe..968b1d7 100755
--- a/fpm/docker-entrypoint.sh
+++ b/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 "$@"
diff --git a/testing/phpmyadmin_test.py b/testing/phpmyadmin_test.py
index fabe5b2..8744e72 100755
--- a/testing/phpmyadmin_test.py
+++ b/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')