From 1b849473bbeaec76a474eec91e06795c543b4ded Mon Sep 17 00:00:00 2001 From: Josiah Baldwin Date: Wed, 8 Jan 2025 13:48:41 -0800 Subject: [PATCH 1/2] Removed silencing of docker process. Useful for debugging server side things with overrides. --- tests/environment/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/environment/__init__.py b/tests/environment/__init__.py index 84aef33..7bc9cb3 100644 --- a/tests/environment/__init__.py +++ b/tests/environment/__init__.py @@ -62,7 +62,7 @@ class TestEnvironment(object): return self # Destroy the env in case it wasn't killed correctly last time. subprocess.check_call(["docker", "compose", "down"], stdout=subprocess.DEVNULL, cwd=thisdir) - self._subp = _docker_process = subprocess.Popen(["docker", "compose", "up", "--build", "--force-recreate", "--no-deps"], stdout=subprocess.DEVNULL, cwd=thisdir) + self._subp = _docker_process = subprocess.Popen(["docker", "compose", "up", "--build", "--force-recreate", "--no-deps"], cwd=thisdir) if not self._wait_for_meshcentral(): self.__exit__(None, None, None) raise Exception("Failed to create docker instance") From 125e6ac6ac37d48369cdb6c6c392803a0d5f0cda Mon Sep 17 00:00:00 2001 From: Josiah Baldwin Date: Wed, 8 Jan 2025 13:54:21 -0800 Subject: [PATCH 2/2] Added override directory which will be copied over meshcentral code for testing purposes --- tests/environment/config/meshcentral/overrides/.gitignore | 4 ++++ tests/environment/meshcentral.dockerfile | 1 + 2 files changed, 5 insertions(+) create mode 100644 tests/environment/config/meshcentral/overrides/.gitignore diff --git a/tests/environment/config/meshcentral/overrides/.gitignore b/tests/environment/config/meshcentral/overrides/.gitignore new file mode 100644 index 0000000..86d0cb2 --- /dev/null +++ b/tests/environment/config/meshcentral/overrides/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore \ No newline at end of file diff --git a/tests/environment/meshcentral.dockerfile b/tests/environment/meshcentral.dockerfile index b2e213a..af192ae 100644 --- a/tests/environment/meshcentral.dockerfile +++ b/tests/environment/meshcentral.dockerfile @@ -4,4 +4,5 @@ RUN apk add python3 WORKDIR /opt/meshcentral/ COPY ./scripts/meshcentral ./scripts COPY ./config/meshcentral/data /opt/meshcentral/meshcentral-data +COPY ./config/meshcentral/overrides /opt/meshcentral/meshcentral CMD ["python3", "/opt/meshcentral/scripts/create_users.py"] \ No newline at end of file