simplify test container usage (#808)

* name

* auto-determine container name

* build test container earlier to keep logspam together

* doc updates

Author: zardus

deploy.sh

@@ -95,8 +95,6 @@ do
 done
 shift $((OPTIND-1))
 
-export DOJO_CONTAINER
-
 if [ "$START" == "yes" ]; then
 	cleanup_container $DOJO_CONTAINER
 
@@ -142,6 +140,9 @@ if [ "$BUILD_IMAGE" == "yes" ]; then
 	IMAGE_NAME="$DOJO_CONTAINER"
 	log_endgroup
 fi
+log_newgroup "Building test container"
+docker build -t "${DOJO_CONTAINER}-test" test/
+log_endgroup
 
 PORT_ARGS=()
 if [ "$EXPORT_PORTS" == "yes" ]; then
@@ -245,16 +246,11 @@ until curl -Ls "http://${CONTAINER_IP}" | grep -q pwn; do sleep 1; done
 log_endgroup
 
 if [ "$TEST" == "yes" ]; then
-	log_newgroup "Building test container"
-	docker build -t "${DOJO_CONTAINER}-test" test/
-	log_endgroup
-	
 	log_newgroup "Running tests in container"
 	docker run --rm \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v "$PWD:/opt/pwn.college" \
-		-e DOJO_CONTAINER="$DOJO_CONTAINER" \
-		-e MOZ_HEADLESS=1 \
+		--name "${DOJO_CONTAINER}-test" \
 		"${DOJO_CONTAINER}-test" \
 		pytest --order-dependencies --timeout=60 -v . "$@"
 	log_endgroup

docs/agents.md

@@ -47,9 +47,8 @@ docker exec -i "$DOJO_CONTAINER" dojo flask
 # enter a learner's container (must be started first via a testcase or the web interface)
 docker exec -i "$DOJO_CONTAINER" dojo enter USER_ID
 
-# run an inidividual testcase --- environment variables need to be set!
-export DOJO_CONTAINER
-pytest -v test/test_dojos.py::test_create_dojo
+# run an inidividual testcase (needs docker socket)
+docker run -v /var/run/docker.sock:/var/run/docker.sock -v $PWD:/opt/pwn.college pytest -v test/test_dojos.py::test_create_dojo
 ```
 
 ### Troubleshooting
@@ -68,9 +67,8 @@ Container start failures show up in the ctfd container logs.
 # Run tests without using docker or workspace cache
 ./deploy.sh -D "" -W "" -t
 
-# Run an individual testcase (needs environment variables)
-export DOJO_CONTAINER=$(basename "$PWD")
-pytest -v test/test_dojos.py::test_create_dojo
+# Run an individual testcase (needs docker socket)
+docker run -v /var/run/docker.sock:/var/run/docker.sock -v $PWD:/opt/pwn.college pytest -v test/test_dojos.py::test_create_dojo
 ```
 
 **Test Script Options:**

test/utils.py

@@ -7,7 +7,36 @@
 import re
 import os
 
-DOJO_CONTAINER = os.getenv("DOJO_CONTAINER", "dojo-test")
+def _get_dojo_container():
+    if os.getenv("DOJO_CONTAINER"):
+        return os.getenv("DOJO_CONTAINER")
+    
+    if os.path.exists("/.dockerenv"):
+        import socket
+        hostname = socket.gethostname()
+        
+        def docker_cmd(args):
+            result = subprocess.run(["docker"] + args, capture_output=True, text=True, check=True)
+            return result.stdout.strip() if result.returncode == 0 else None
+        
+        container_name = docker_cmd(["ps", "--filter", f"id={hostname}", "--format", "{{.Names}}"])
+        if container_name.endswith("-test"):
+            return container_name[:-5]
+        
+        all_containers = docker_cmd(["ps", "--format", "{{.Names}}"])
+        if len(all_containers) == 2:
+            return next(c for c in all_containers.split('\n') if c and c != container_name)
+    else:
+        result = subprocess.run(
+            ["git", "rev-parse", "--show-toplevel"],
+            capture_output=True, text=True, cwd=os.path.dirname(__file__)
+        )
+        if result.returncode == 0:
+            return os.path.basename(result.stdout.strip())
+
+    raise RuntimeError(f"Unable to determine the container the dojo is running in. Please set DOJO_CONTAINER.")
+
+DOJO_CONTAINER = _get_dojo_container()
 
 def _get_container_ip(container_name):
     result = subprocess.run(