Introduce DOCKER_CONFIG_FILE in test suite

Author: le-lenn

test/README.md

@@ -41,10 +41,14 @@ IMAGE_TAG=v2.30.0 ./test.sh
 
 By default, two local images are created that persist the image data and provide it to containers at runtime.
 
-#### `ISOLATE_DOCKER_CONFIG`
+#### `DOCKER_CONFIG_FILE`
 
-By default, the sandbox mounts `${HOME}/.docker/config.json` so host credentials are available.
-In case your local docker config is not compatible with this behaviour, you can force an empty Docker config in the run by setting `ISOLATE_DOCKER_CONFIG=1 ./test.sh`.
+By default, the sandbox uses an empty Docker config file (`./docker-config.json`).
+To use host credentials (e.g. in CI), set `DOCKER_CONFIG_FILE` to the desired `config.json` location:
+
+```sh
+DOCKER_CONFIG_FILE=${HOME}/.docker/config.json ./test.sh
+```
 
 ## Understanding the test setup
 

test/docker-compose.isolated.yml

@@ -10,7 +10,7 @@ services:
       retries: 50
     volumes:
       - ./:/code
-      - ${HOME}/.docker/config.json:/root/.docker/config.json
+      - ${DOCKER_CONFIG_FILE:-./docker-config.json}:/root/.docker/config.json
       - ${TARBALL:-.}:/cache/image.tar.gz
       - docker_volume_backup_test_sandbox_image:/var/lib/docker/image
       - docker_volume_backup_test_sandbox_containerd:/var/lib/docker/containerd
@@ -20,7 +20,7 @@ services:
     hostname: worker1
     volumes:
       - ./:/code
-      - ${HOME}/.docker/config.json:/root/.docker/config.json
+      - ${DOCKER_CONFIG_FILE:-./docker-config.json}:/root/.docker/config.json
       - ${TARBALL:-.}:/cache/image.tar.gz
       - docker_volume_backup_test_sandbox_image:/var/lib/docker/image
       - docker_volume_backup_test_sandbox_containerd_1:/var/lib/docker/containerd
@@ -31,7 +31,7 @@ services:
     hostname: worker2
     volumes:
       - ./:/code
-      - ${HOME}/.docker/config.json:/root/.docker/config.json
+      - ${DOCKER_CONFIG_FILE:-./docker-config.json}:/root/.docker/config.json
       - ${TARBALL:-.}:/cache/image.tar.gz
       - docker_volume_backup_test_sandbox_image:/var/lib/docker/image
       - docker_volume_backup_test_sandbox_containerd_2:/var/lib/docker/containerd

test/docker-compose.yml

@@ -0,0 +1 @@
+{}

test/docker-config.json

@@ -4,17 +4,12 @@ set -e
 
 MATCH_PATTERN=$1
 IMAGE_TAG=${IMAGE_TAG:-canary}
-ISOLATE_DOCKER_CONFIG=${ISOLATE_DOCKER_CONFIG:-}
 
 sandbox="docker_volume_backup_test_sandbox"
 tarball="$(mktemp -d)/image.tar.gz"
 compose_profile="default"
 compose_files="-f docker-compose.yml"
 
-if [ -n "$ISOLATE_DOCKER_CONFIG" ]; then
-  compose_files="$compose_files -f docker-compose.isolated.yml"
-fi
-
 trap finish EXIT INT TERM
 
 finish () {