From 76ab0143dc6e07a3468f26d0cc0de3d030b16530 Mon Sep 17 00:00:00 2001 From: netkas Date: Fri, 21 Mar 2025 14:13:26 -0400 Subject: [PATCH] Refactor docker-compose setup to use named volumes and prepare test environment --- .github/workflows/ncc_workflow.yml | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/.github/workflows/ncc_workflow.yml b/.github/workflows/ncc_workflow.yml index a519507..9d1d165 100644 --- a/.github/workflows/ncc_workflow.yml +++ b/.github/workflows/ncc_workflow.yml @@ -357,6 +357,43 @@ jobs: return 1 } + # Prepare the environment + chmod -R 777 tests/docker + + # Modify volume mounts to use named volumes + sed -i 's|./tests/docker/coffee/config:/etc/config:z|coffee_config_volume:/etc/config:z|g' docker-compose.test.yml + sed -i 's|./tests/docker/coffee/data:/etc/socialbox:z|coffee_data_volume:/etc/socialbox:z|g' docker-compose.test.yml + sed -i 's|./tests/docker/coffee/logs:/var/log:z|coffee_logs_volume:/var/log:z|g' docker-compose.test.yml + + sed -i 's|./tests/docker/teapot/config:/etc/config:z|teapot_config_volume:/etc/config:z|g' docker-compose.test.yml + sed -i 's|./tests/docker/teapot/data:/etc/socialbox:z|teapot_data_volume:/etc/socialbox:z|g' docker-compose.test.yml + sed -i 's|./tests/docker/teapot/logs:/var/log:z|teapot_logs_volume:/var/log:z|g' docker-compose.test.yml + + # Add the named volumes to the volumes section + echo " coffee_config_volume:" >> docker-compose.test.yml + echo " driver: local" >> docker-compose.test.yml + echo " coffee_data_volume:" >> docker-compose.test.yml + echo " driver: local" >> docker-compose.test.yml + echo " coffee_logs_volume:" >> docker-compose.test.yml + echo " driver: local" >> docker-compose.test.yml + echo " teapot_config_volume:" >> docker-compose.test.yml + echo " driver: local" >> docker-compose.test.yml + echo " teapot_data_volume:" >> docker-compose.test.yml + echo " driver: local" >> docker-compose.test.yml + echo " teapot_logs_volume:" >> docker-compose.test.yml + echo " driver: local" >> docker-compose.test.yml + + # Copy files to a temporary location that can be mounted + mkdir -p /tmp/coffee/config /tmp/coffee/data /tmp/coffee/logs + mkdir -p /tmp/teapot/config /tmp/teapot/data /tmp/teapot/logs + + cp -r tests/docker/coffee/config/* /tmp/coffee/config/ || true + cp -r tests/docker/coffee/data/* /tmp/coffee/data/ || true + cp -r tests/docker/teapot/config/* /tmp/teapot/config/ || true + cp -r tests/docker/teapot/data/* /tmp/teapot/data/ || true + + cat docker-compose.test.yml + # Prepare phpunit wget https://phar.phpunit.de/phpunit-11.3.phar docker-compose -f docker-compose.test.yml up -d