chore: make 'base_dir' and 'working_dir' configurable

Use `./test/workdir` as the default `base_dir` instead
of `/tmp/go-fdo` as the directory where the test files
will be created.

Configure the container's working dir through the `working_dir`
variable (default: `/workdir`)

Signed-off-by: Miguel Martín <[email protected]>

Author: mmartinv

.gitignore

@@ -5,3 +5,4 @@ go.work.sum
 go-fdo-server
 go-fdo-server-*.tar.gz
 rpmbuild
+test/workdir

deployments/compose/client/fdo-client.yaml

@@ -4,12 +4,12 @@ services:
     hostname: go-fdo-client
     image: go-fdo-client
     build: https://github.com/fido-device-onboard/go-fdo-client.git#main
-    working_dir: /tmp/go-fdo/device-credentials
+    working_dir: ${container_working_dir:-/workdir}/device-credentials
     user: "${container_user}"
     networks:
       - fdo
     volumes:
-      - /tmp:/tmp:z
+      - ${base_dir:-./test/workdir}:${container_working_dir:-/workdir}
     restart: no
 networks:
   fdo:

deployments/compose/server/fdo-onboarding-servers.yaml

@@ -10,18 +10,18 @@ services:
       TZ: Europe/Madrid
     user: ${container_user}
     command:
-     - --db=/tmp/go-fdo/manufacturer.db
-     - --db-pass='2=,%95QF<uTLLHt'
-     - --debug
      - manufacturing
      - manufacturer:8038
-     - --manufacturing-key=/tmp/go-fdo/certs/manufacturer.key
-     - --owner-cert=/tmp/go-fdo/certs/owner.crt
-     - --device-ca-cert=/tmp/go-fdo/certs/device_ca.crt
-     - --device-ca-key=/tmp/go-fdo/certs/device_ca.key
-    working_dir: /tmp/go-fdo
+     - --db=${container_working_dir:-/workdir}/manufacturer.db
+     - --db-pass='2=,%95QF<uTLLHt'
+     - --debug
+     - --manufacturing-key=${container_working_dir:-/workdir}/certs/manufacturer.key
+     - --owner-cert=${container_working_dir:-/workdir}/certs/owner.crt
+     - --device-ca-cert=${container_working_dir:-/workdir}/certs/device_ca.crt
+     - --device-ca-key=${container_working_dir:-/workdir}/certs/device_ca.key
+    working_dir: ${container_working_dir:-/workdir}
     volumes:
-      - /tmp:/tmp:z
+      - ${base_dir:-./test/workdir}:${container_working_dir:-/workdir}
     networks:
       - fdo
     ports:
@@ -43,14 +43,14 @@ services:
       TZ: Europe/Madrid
     user: ${container_user}
     command:
-      - --db=/tmp/go-fdo/rendezvous.db
-      - --db-pass='2=,%95QF<uTLLHt'
-      - --debug
       - rendezvous
       - rendezvous:8041
-    working_dir: /tmp/go-fdo
+      - --db=${container_working_dir:-/workdir}/rendezvous.db
+      - --db-pass='2=,%95QF<uTLLHt'
+      - --debug
+    working_dir: ${container_working_dir:-/workdir}
     volumes:
-      - /tmp:/tmp:z
+      - ${base_dir:-./test/workdir}:${container_working_dir:-/workdir}
     networks:
       - fdo
     ports:
@@ -72,16 +72,16 @@ services:
       TZ: Europe/Madrid
     user: ${container_user}
     command:
-      - --db=/tmp/go-fdo/owner.db
-      - --db-pass='2=,%95QF<uTLLHt'
-      - --debug
       - owner
       - owner:8043
-      - --owner-key=/tmp/go-fdo/certs/owner.key
-      - --device-ca-cert=/tmp/go-fdo/certs/device_ca.crt
-    working_dir: /tmp/go-fdo
+      - --db=${container_working_dir:-/workdir}/owner.db
+      - --db-pass='2=,%95QF<uTLLHt'
+      - --debug
+      - --owner-key=${container_working_dir:-/workdir}/certs/owner.key
+      - --device-ca-cert=${container_working_dir:-/workdir}/certs/device_ca.crt
+    working_dir: ${container_working_dir:-/workdir}
     volumes:
-      - /tmp:/tmp:z
+      - ${base_dir:-./test/workdir}:${container_working_dir:-/workdir}
     networks:
       - fdo
     ports:

deployments/compose/server/fdo-resale-servers.yaml

@@ -10,20 +10,20 @@ services:
       TZ: Europe/Madrid
     user: ${container_user}
     command:
-      - --db=/tmp/go-fdo/new_owner.db
-      - --db-pass='2=,%95QF<uTLLHt'
-      - --debug
       - owner
       - new_owner:8045
-      - --owner-key=/tmp/go-fdo/certs/new_owner.key
-      - --device-ca-cert=/tmp/go-fdo/certs/device_ca.crt
-    working_dir: /tmp/go-fdo
+      - --db=${container_working_dir:-/workdir}/new_owner.db
+      - --db-pass='2=,%95QF<uTLLHt'
+      - --debug
+      - --owner-key=${container_working_dir:-/workdir}/certs/new_owner.key
+      - --device-ca-cert=${container_working_dir:-/workdir}/certs/device_ca.crt
+    working_dir: ${container_working_dir:-/workdir}
     networks:
       - fdo
     ports:
       - 8045:8045
     volumes:
-      - /tmp:/tmp:z
+      - ${base_dir:-./test/workdir}:${container_working_dir:-/workdir}
     restart: unless-stopped
     healthcheck:
       test: [ "CMD", "curl --silent --output /dev/null --fail http://new_owner:8045/health" ]

deployments/compose/server/fsim-fdo-download-override.yaml

@@ -1,14 +1,14 @@
 services:
   owner:
     command:
-      - --db=/tmp/go-fdo/owner.db
-      - --db-pass='2=,%95QF<uTLLHt'
-      - --debug
       - owner
       - owner:8043
-      - --owner-key=/tmp/go-fdo/certs/owner.key
-      - --device-ca-cert=/tmp/go-fdo/certs/device_ca.crt
+      - --db=${container_working_dir:-/workdir}/owner.db
+      - --db-pass='2=,%95QF<uTLLHt'
+      - --debug
+      - --owner-key=${container_working_dir:-/workdir}/certs/owner.key
+      - --device-ca-cert=${container_working_dir:-/workdir}/certs/device_ca.crt
       - --command-download=file1
-      - --command-download=/tmp/go-fdo/fsim/download/owner/file2
-      - --command-download=/tmp/go-fdo/fsim/download/owner/subdir1/file3
-    working_dir: /tmp/go-fdo/fsim/download/owner
+      - --command-download=${container_working_dir:-/workdir}/fsim/download/owner/file2
+      - --command-download=${container_working_dir:-/workdir}/fsim/download/owner/subdir1/file3
+    working_dir: ${container_working_dir:-/workdir}/fsim/download/owner

deployments/compose/server/fsim-fdo-upload-override.yaml

@@ -1,15 +1,15 @@
 services:
   owner:
     command:
-      - --db=/tmp/go-fdo/owner.db
-      - --db-pass='2=,%95QF<uTLLHt'
-      - --debug
       - owner
       - owner:8043
-      - --owner-key=/tmp/go-fdo/certs/owner.key
-      - --device-ca-cert=/tmp/go-fdo/certs/device_ca.crt
-      - --upload-directory=/tmp/go-fdo/fsim/upload/owner
+      - --db=${container_working_dir:-/workdir}/owner.db
+      - --db-pass='2=,%95QF<uTLLHt'
+      - --debug
+      - --owner-key=${container_working_dir:-/workdir}/certs/owner.key
+      - --device-ca-cert=${container_working_dir:-/workdir}/certs/device_ca.crt
+      - --upload-directory=${container_working_dir:-/workdir}/fsim/upload/owner
       - --command-upload=file1
       - --command-upload=subdir1/file2
       - --command-upload=subdir1/subdir2/file3
-    working_dir: /tmp/go/fdo/fsim/upload/owner
+    working_dir: ${container_working_dir:-/workdir}/fsim/upload/owner

deployments/compose/server/fsim-fdo-wget-override.yaml

@@ -1,13 +1,13 @@
 services:
   owner:
     command:
-      - --db=/tmp/go-fdo/owner.db
-      - --db-pass='2=,%95QF<uTLLHt'
-      - --debug
       - owner
       - owner:8043
-      - --owner-key=/tmp/go-fdo/certs/owner.key
-      - --device-ca-cert=/tmp/go-fdo/certs/device_ca.crt
+      - --db=${container_working_dir:-/workdir}/owner.db
+      - --db-pass='2=,%95QF<uTLLHt'
+      - --debug
+      - --owner-key=${container_working_dir:-/workdir}/certs/owner.key
+      - --device-ca-cert=${container_working_dir:-/workdir}/certs/device_ca.crt
       - --command-wget=http://wget_httpd:8888/file1
   wget_httpd:
     container_name: wget_httpd
@@ -21,13 +21,13 @@ services:
       - "-m"
       - "http.server"
       - "8888"
-    working_dir: /tmp/go-fdo/fsim/wget/httpd
+    working_dir: ${container_working_dir:-/workdir}/fsim/wget/httpd
     networks:
       - fdo
     ports:
       - 8888:8888
     volumes:
-      - /tmp:/tmp:z
+      - ${base_dir:-./test/workdir}:${container_working_dir:-/workdir}
     restart: unless-stopped
     healthcheck:
       test: [ "CMD", "curl --silent --output /dev/null --fail http://wget_httpd:8888" ]

test/ci/utils.sh

@@ -7,7 +7,7 @@ trap stop_services EXIT
 source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)/../../scripts/cert-utils.sh"
 source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)/../../scripts/fdo-utils.sh"
 
-base_dir="/tmp/go-fdo"
+base_dir="${PWD}/test/workdir"
 bin_dir="${base_dir}/bin"
 pid_dir="${base_dir}/run"
 logs_dir="${base_dir}/logs"

test/container/utils.sh

@@ -3,11 +3,19 @@
 set -euo pipefail
 
 client_compose_file="deployments/compose/client/fdo-client.yaml"
-servers_compose_file="deployments/compose/servers/fdo-onboarding-servers.yaml"
+servers_compose_file="deployments/compose/server/fdo-onboarding-servers.yaml"
 
+# Export base_dir explicitly for Docker Compose
+export base_dir
+
+# Export container_user explicitly for Docker Compose
 container_user="$(id -u):$(id -g)"
 export container_user
 
+# Container working directory (default to /workdir if not set)
+container_working_dir="${container_working_dir:-/workdir}"
+export container_working_dir
+
 get_real_ip() {
   local service_name=$1
   docker inspect --format='{{.NetworkSettings.Networks.fdo.IPAddress}}' "${service_name}"
@@ -41,7 +49,13 @@ uninstall_client() {
 }
 
 run_go_fdo_client() {
-  docker compose --file "${client_compose_file}" run --rm go-fdo-client "$@"
+  # Translate host paths to container paths in arguments
+  local args=()
+  for arg in "$@"; do
+    # Replace base_dir with container_working_dir in paths
+    args+=("${arg//$base_dir/$container_working_dir}")
+  done
+  docker compose --file "${client_compose_file}" run --rm go-fdo-client "${args[@]}"
 }
 
 install_server() {