diff --git a/test/commands/docker-compose.yml b/test/commands/docker-compose.yml index 5568b45..67909d5 100644 --- a/test/commands/docker-compose.yml +++ b/test/commands/docker-compose.yml @@ -42,10 +42,9 @@ services: EXEC_LABEL: test EXEC_FORWARD_OUTPUT: "true" volumes: - - archive:/archive + - ./local:/archive - app_data:/backup/data:ro - /var/run/docker.sock:/var/run/docker.sock volumes: app_data: - archive: diff --git a/test/commands/run.sh b/test/commands/run.sh index 6074ebe..aa33e1f 100644 --- a/test/commands/run.sh +++ b/test/commands/run.sh @@ -6,11 +6,12 @@ cd $(dirname $0) . ../util.sh current_test=$(basename $(pwd)) +mkdir -p ./local + docker compose up -d sleep 30 # mariadb likes to take a bit before responding docker compose exec backup backup -sudo cp -r $(docker volume inspect --format='{{ .Mountpoint }}' commands_archive) ./local tar -xvf ./local/test.tar.gz if [ ! -f ./backup/data/dump.sql ]; then @@ -34,6 +35,7 @@ sudo rm -rf ./local info "Running commands test in swarm mode next." +mkdir -p ./local docker swarm init docker stack deploy --compose-file=docker-compose.yml test_stack @@ -47,8 +49,6 @@ sleep 20 docker exec $(docker ps -q -f name=backup) backup -sudo cp -r $(docker volume inspect --format='{{ .Mountpoint }}' test_stack_archive) ./local - tar -xvf ./local/test.tar.gz if [ ! -f ./backup/data/dump.sql ]; then fail "Could not find file written by pre command."