From a6c091bd8cce04fcb87ae9449915f02337a1b410 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 29 Jun 2023 13:22:07 +0200
Subject: [PATCH] Add a test for #401 - `/etc/phpmyadmin/conf.d/`

---
 .github/workflows/run-tests.yml               |  2 +-
 Makefile                                      |  2 +-
 ...ocker-compose.testing-config-mount-dir.yml | 69 +++++++++++++++++++
 3 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 testing/docker-compose/docker-compose.testing-config-mount-dir.yml

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 80d3f3e..8cc50ae 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -15,7 +15,7 @@ jobs:
             fail-fast: false
             matrix:
                 database-image: ["mariadb:10.6", "mariadb:10.11", "mysql:5.7", "mariadb:latest", "mysql:latest"]
-                configuration: ["default", "one-host", "fs-import-export", "different-apache-port"]
+                configuration: ["default", "one-host", "config-mount-dir", "fs-import-export", "different-apache-port"]
 
         steps:
             - uses: actions/checkout@v3
diff --git a/Makefile b/Makefile
index 7f9be20..0af25c5 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ testing-%:
 	docker-compose -p "phpmyadmin_$@" -f ./testing/docker-compose/docker-compose.$@.yml up --build --abort-on-container-exit --exit-code-from=sut
 	docker-compose -p "phpmyadmin_$@" -f ./testing/docker-compose/docker-compose.$@.yml down
 
-run-tests: testing-default testing-one-host testing-fs-import-export testing-different-apache-port
+run-tests: testing-default testing-one-host testing-config-mount-dir testing-fs-import-export testing-different-apache-port
 
 logs:
 	docker-compose -f ./testing/docker-compose/docker-compose.testing-default.yml logs
diff --git a/testing/docker-compose/docker-compose.testing-config-mount-dir.yml b/testing/docker-compose/docker-compose.testing-config-mount-dir.yml
new file mode 100644
index 0000000..80cf24c
--- /dev/null
+++ b/testing/docker-compose/docker-compose.testing-config-mount-dir.yml
@@ -0,0 +1,69 @@
+version: "3.1"
+
+services:
+  db_server:
+    image: ${DB:-mariadb:10.11}
+    environment:
+      MYSQL_ROOT_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-uroot", "-p${TESTSUITE_PASSWORD:-my-secret-pw}"]
+      start_period: 10s
+      interval: 5s
+      timeout: 60s
+      retries: 10
+    networks:
+      testing:
+        aliases:
+         - phpmyadmin_testing_db
+    tmpfs:
+      - /var/lib/mysql:rw,noexec,nosuid,size=300m
+
+  phpmyadmin:
+    build:
+      context: ../../apache
+    environment:
+      PMA_HOST: db_server
+      UPLOAD_LIMIT: 123M
+      MAX_EXECUTION_TIME: 125
+      HIDE_PHP_VERSION: 1
+    volumes:
+      - ../config.user.inc.php:/etc/phpmyadmin/conf.d/config.test.php:ro
+    healthcheck:
+      test: ["CMD", "curl", "-Ss", "http://localhost/robots.txt"]
+      start_period: 5s
+      interval: 3s
+      timeout: 60s
+      retries: 10
+    networks:
+      testing:
+        aliases:
+         - phpmyadmin_testing_apache
+    depends_on:
+      db_server:
+        condition: service_healthy
+
+  sut:
+    depends_on:
+      phpmyadmin:
+        condition: service_healthy
+      db_server:
+        condition: service_healthy
+    build:
+      context: ../
+    command: "/tests/testing/test-docker.sh"
+    networks:
+      testing:
+    environment:
+      TESTSUITE_HOSTNAME: phpmyadmin_testing_apache
+      TESTSUITE_PORT: 80
+      TESTSUITE_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
+      PMA_HOST: phpmyadmin_testing_db
+      PMA_PORT: 3306
+    volumes:
+      - ../../:/tests:ro
+      - /var/run/docker.sock:/var/run/docker.sock
+    working_dir: /tests
+
+networks:
+    testing:
+        driver: bridge