ddtest

wip

Author: smola

docker-compose.yml

@@ -176,6 +176,7 @@ services:
         #  dockerfile: Dockerfile
         image: ghcr.io/datadog/dd-trace-py/testrunner:8b69a2610342b333f8832422ffc4f3a9327bed13@sha256:c2d067947ffdb305fc7dc7ff1f8eb7035cfa110bd1199917dd2519eadd166402
         command: bash
+        entrypoint: /project/scripts/ddtest-entrypoint.sh
         environment:
           DD_SETUP_CACHE_DOWNLOADS: "1"
           DD_CMAKE_INCREMENTAL_BUILD: "1"
@@ -184,11 +185,11 @@ services:
           CARGO_BUILD_JOBS: "12"
         network_mode: host
         userns_mode: host
-        working_dir: /root/project/
+        working_dir: /project/
         volumes:
           - ddagent:/tmp/ddagent
-          - ./:/root/project
-          - ./.riot:/root/project/.riot
+          - ./:/project
+          - ./.riot:/project/.riot
 
     localstack:
         image: localstack/localstack:1.4.0

scripts/ddtest

@@ -9,8 +9,16 @@ then
     CMD=bash
 fi
 
+# Make UID and GID available to the testrunner container, to run with the same user as the host.
+# The entrypoint at scripts/ddtest-entrypoint.sh will drop privileges to the user with the given UID and GID.
+# This will ensure any file created on mounted volumes have the right ownership.
+export EFFECTIVE_UID=$(id -u)
+export EFFECTIVE_GID=$(id -g)
+
 docker compose run \
        -e DD_TRACE_AGENT_URL \
+       -e EFFECTIVE_UID \
+       -e EFFECTIVE_GID \
        --rm \
        -i \
        testrunner \

scripts/ddtest-entrypoint.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -eu
+
+# If EFFECTIVE_UID, EFFECTIVE_GID are set, then create a user with that UID and GID
+# and drop privileges to that user.
+if [ -n "${EFFECTIVE_UID:-}" ] && [ -n "${EFFECTIVE_GID:-}" ]; then
+    groupadd -g "${EFFECTIVE_GID}" user
+    useradd -u "${EFFECTIVE_UID}" -g "${EFFECTIVE_GID}" -m user
+    env
+    exec su - user -c "$@"
+fi
+
+exec "$@"