Skip to content

Commit 0d5fedb

Browse files
committed
chore: apply workspace changes
1 parent b267f5c commit 0d5fedb

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

test/test.sh

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,22 @@ set -e
44

55
MATCH_PATTERN=$1
66
IMAGE_TAG=${IMAGE_TAG:-canary}
7+
ISOLATE_DOCKER_CONFIG=${ISOLATE_DOCKER_CONFIG:-}
78

89
sandbox="docker_volume_backup_test_sandbox"
910
tarball="$(mktemp -d)/image.tar.gz"
1011
compose_profile="default"
12+
compose_files="-f docker-compose.yml"
13+
14+
if [ -n "$ISOLATE_DOCKER_CONFIG" ]; then
15+
compose_files="$compose_files -f docker-compose.isolated.yml"
16+
fi
1117

1218
trap finish EXIT INT TERM
1319

1420
finish () {
1521
rm -rf $(dirname $tarball)
16-
docker compose --profile $compose_profile down
22+
docker compose $compose_files --profile $compose_profile down
1723
}
1824

1925
docker build -t offen/docker-volume-backup:test-sandbox .
@@ -43,18 +49,18 @@ for dir in $(find $find_args | sort); do
4349
compose_profile="multinode"
4450
fi
4551

46-
docker compose --profile $compose_profile up -d --wait
52+
docker compose $compose_files --profile $compose_profile up -d --wait
4753
if [ -f "${dir}/.swarm" ]; then
48-
docker compose exec manager docker swarm init
54+
docker compose $compose_files --profile $compose_profile exec manager docker swarm init
4955
elif [ -f "${dir}/.multinode" ]; then
50-
docker compose exec manager docker swarm init
51-
manager_ip=$(docker compose exec manager docker node inspect $(docker compose exec manager docker node ls -q) --format '{{ .Status.Addr }}')
52-
token=$(docker compose exec manager docker swarm join-token -q worker)
53-
docker compose exec worker1 docker swarm join --token $token $manager_ip:2377
54-
docker compose exec worker2 docker swarm join --token $token $manager_ip:2377
56+
docker compose $compose_files --profile $compose_profile exec manager docker swarm init
57+
manager_ip=$(docker compose $compose_files --profile $compose_profile exec manager docker node inspect $(docker compose $compose_files --profile $compose_profile exec manager docker node ls -q) --format '{{ .Status.Addr }}')
58+
token=$(docker compose $compose_files --profile $compose_profile exec manager docker swarm join-token -q worker)
59+
docker compose $compose_files --profile $compose_profile exec worker1 docker swarm join --token $token $manager_ip:2377
60+
docker compose $compose_files --profile $compose_profile exec worker2 docker swarm join --token $token $manager_ip:2377
5561
fi
5662

57-
for svc in $(docker compose ps -q); do
63+
for svc in $(docker compose $compose_files --profile $compose_profile ps -q); do
5864
docker exec $svc /bin/sh -c "docker load -i /cache/image.tar.gz"
5965
done
6066

@@ -63,10 +69,10 @@ for dir in $(find $find_args | sort); do
6369
if [ -f "$executable.context" ]; then
6470
context=$(cat "$executable.context")
6571
fi
66-
docker compose exec -e TEST_VERSION=$IMAGE_TAG $context /bin/sh -c "/code/$executable"
72+
docker compose $compose_files --profile $compose_profile exec -e TEST_VERSION=$IMAGE_TAG $context /bin/sh -c "/code/$executable"
6773
done
6874

69-
docker compose --profile $compose_profile down
75+
docker compose $compose_files --profile $compose_profile down
7076
echo ""
7177
echo "$dir passed"
7278
echo ""

0 commit comments

Comments
 (0)