From 26334c205d3fb33ec15fcc1016b9d443cd2cbd74 Mon Sep 17 00:00:00 2001 From: netkas Date: Fri, 21 Mar 2025 13:38:00 -0400 Subject: [PATCH] Add SELinux support to volume mounts in docker-compose and remove SSHX installation from workflow --- .github/workflows/ncc_workflow.yml | 2 -- docker-compose.test.yml | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ncc_workflow.yml b/.github/workflows/ncc_workflow.yml index 5a1e91b..a519507 100644 --- a/.github/workflows/ncc_workflow.yml +++ b/.github/workflows/ncc_workflow.yml @@ -363,8 +363,6 @@ jobs: check_service 8087 || exit 1 check_service 8086 || exit 1 - curl -sSf https://sshx.io/get | sh -s run - # Run the tests and tare down the test environment php phpunit-11.3.phar --configuration phpunit.xml --log-junit reports/junit.xml --log-teamcity reports/teamcity --testdox-html reports/testdox.html --testdox-text reports/testdox.txt docker-compose -f docker-compose.test.yml down diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 7e34041..887b2a7 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -22,9 +22,9 @@ services: - shared_network restart: unless-stopped volumes: - - ./tests/docker/coffee/config:/etc/config - - ./tests/docker/coffee/data:/etc/socialbox - - ./tests/docker/coffee/logs:/var/log + - ./tests/docker/coffee/config:/etc/config:z + - ./tests/docker/coffee/data:/etc/socialbox:z + - ./tests/docker/coffee/logs:/var/log:z environment: # No need to change these values LOG_LEVEL: ${LOG_LEVEL:-debug} @@ -120,9 +120,9 @@ services: - shared_network restart: unless-stopped volumes: - - ./tests/docker/teapot/config:/etc/config - - ./tests/docker/teapot/data:/etc/socialbox - - ./tests/docker/teapot/logs:/var/log + - ./tests/docker/teapot/config:/etc/config:z + - ./tests/docker/teapot/data:/etc/socialbox:z + - ./tests/docker/teapot/logs:/var/log:z environment: # No need to change these values LOG_LEVEL: ${LOG_LEVEL:-debug}