Move docker-compose test files into a folder

Author: williamdes

.github/workflows/run-tests.yml

@@ -9,21 +9,21 @@ on:
 
 jobs:
     test-apache-container:
-        name: Test on database ${{ matrix.database-image }}
+        name: Test (${{ matrix.configuration }}) on database ${{ matrix.database-image }}
         runs-on: ubuntu-latest
         strategy:
+            fail-fast: false
             matrix:
                 database-image: ["mariadb:10.4", "mysql:5.7", "mariadb:latest", "mysql:latest"]
+                configuration: ["default", "one-host"]
 
         steps:
             - uses: actions/checkout@v3
             - name: Build images
-              run: docker-compose -f docker-compose.testing.yml build
-            - name: Run normal tests
-              run: docker-compose -f docker-compose.testing.yml up --build --abort-on-container-exit --exit-code-from=sut
+              working-directory: ./testing/
+              run: docker-compose -f ./docker-compose/docker-compose.testing-${{ matrix.configuration }}.yml build
+            - name: Run ${{ matrix.configuration }} tests
+              working-directory: ./testing/
+              run: docker-compose -f ./docker-compose/docker-compose.testing-${{ matrix.configuration }}.yml up --build --abort-on-container-exit --exit-code-from=sut
               env:
                 DB: ${{ matrix.database-image }}
-            - name: Run one host tests
-              run: docker-compose -f docker-compose.testing-one-host.yml up --build --abort-on-container-exit --exit-code-from=sut
-              env:
-                DB: ${{ matrix.database-image }}

docker-compose.testing.yml renamed to testing/docker-compose/docker-compose.testing-default.yml

@@ -15,21 +15,21 @@ services:
     networks:
       testing:
     volumes:
-      - ./testing/testing.cnf:/etc/mysql/conf.d/testing.cnf:ro
+      - ../testing.cnf:/etc/mysql/conf.d/testing.cnf:ro
     tmpfs:
       - /var/lib/mysql:rw,noexec,nosuid,size=300m
 
   phpmyadmin:
     build:
-      context: apache
+      context: ../../apache
     container_name: phpmyadmin_testing_apache
     environment:
       PMA_ARBITRARY: 1
       UPLOAD_LIMIT: 123M
       MAX_EXECUTION_TIME: 125
       HIDE_PHP_VERSION: 1
     volumes:
-      - ./testing/config.user.inc.php:/etc/phpmyadmin/config.user.inc.php
+      - ../config.user.inc.php:/etc/phpmyadmin/config.user.inc.php:ro
     healthcheck:
       test: ["CMD", "curl", "-Ss", "http://localhost/robots.txt"]
       start_period: 5s
@@ -49,7 +49,7 @@ services:
       db_server:
         condition: service_healthy
     build:
-      context: testing
+      context: ../
     command: "/tests/testing/test-docker.sh"
     networks:
       testing:
@@ -60,7 +60,7 @@ services:
       TESTSUITE_PORT: 80
       TESTSUITE_PASSWORD: "${TESTSUITE_PASSWORD:-my-secret-pw}"
     volumes:
-      - ./:/tests:ro
+      - ../../:/tests:ro
       - /var/run/docker.sock:/var/run/docker.sock
     working_dir: /tests
 

docker-compose.testing-one-host.yml renamed to testing/docker-compose/docker-compose.testing-one-host.yml

@@ -15,21 +15,21 @@ services:
     networks:
       testing:
     volumes:
-      - ./testing/testing.cnf:/etc/mysql/conf.d/testing.cnf:ro
+      - ./testing.cnf:/etc/mysql/conf.d/testing.cnf:ro
     tmpfs:
       - /var/lib/mysql:rw,noexec,nosuid,size=300m
 
   phpmyadmin:
     build:
-      context: apache
+      context: ../../apache
     container_name: phpmyadmin_testing_apache
     environment:
       PMA_HOST: db_server
       UPLOAD_LIMIT: 123M
       MAX_EXECUTION_TIME: 125
       HIDE_PHP_VERSION: 1
     volumes:
-      - ./testing/config.user.inc.php:/etc/phpmyadmin/config.user.inc.php
+      - ../config.user.inc.php:/etc/phpmyadmin/config.user.inc.php:ro
     healthcheck:
       test: ["CMD", "curl", "-Ss", "http://localhost/robots.txt"]
       start_period: 5s
@@ -49,7 +49,7 @@ services:
       db_server:
         condition: service_healthy
     build:
-      context: testing
+      context: ../
     command: "/tests/testing/test-docker.sh"
     networks:
       testing:
@@ -60,7 +60,7 @@ services:
       PMA_HOST: phpmyadmin_testing_db
       PMA_PORT: 3306
     volumes:
-      - ./:/tests:ro
+      - ../../:/tests:ro
       - /var/run/docker.sock:/var/run/docker.sock
     working_dir: /tests