From 47d4fe3960b3954b37927f1374b26496321a850e Mon Sep 17 00:00:00 2001 From: Gerard Snaauw Date: Fri, 22 Mar 2024 12:52:08 +0100 Subject: [PATCH] host and container use same user 1 e2e-test --- e2e-tests/storage/backup-restore/docker-compose.yml | 1 + e2e-tests/storage/backup-restore/run-test.sh | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/e2e-tests/storage/backup-restore/docker-compose.yml b/e2e-tests/storage/backup-restore/docker-compose.yml index a7f46c230e..2d612b5135 100644 --- a/e2e-tests/storage/backup-restore/docker-compose.yml +++ b/e2e-tests/storage/backup-restore/docker-compose.yml @@ -1,5 +1,6 @@ services: nodeA: + user: "$USER:$USER" image: "${IMAGE_NODE_A:-nutsfoundation/nuts-node:master}" environment: NUTS_CONFIGFILE: /opt/nuts/nuts.yaml diff --git a/e2e-tests/storage/backup-restore/run-test.sh b/e2e-tests/storage/backup-restore/run-test.sh index 12f38ff5bd..2fd97623c5 100755 --- a/e2e-tests/storage/backup-restore/run-test.sh +++ b/e2e-tests/storage/backup-restore/run-test.sh @@ -1,19 +1,20 @@ #!/usr/bin/env bash source ../../util.sh +USER=$UID echo "------------------------------------" echo "Cleaning up running Docker containers and volumes, and key material..." echo "------------------------------------" docker compose down docker compose rm -f -v -rm -rf ./node-data/* -rm -rf ./node-backup/* +rm -rf ./node-data +rm -rf ./node-backup echo "------------------------------------" echo "Starting Docker containers..." echo "------------------------------------" -mkdir -p ./node-data ./node-backup ./node-backup/vcr/ # 'data' dirs will be created with root owner by docker if they do not exit. This creates permission issues on CI. +mkdir -p ./node-data ./node-backup/vcr/ # 'data' dirs will be created with root owner by docker if they do not exit. This creates permission issues on CI. docker compose up --wait echo "------------------------------------" @@ -50,7 +51,8 @@ docker compose stop # Copy files not in BBolt DB, so they can be restored. Then empty data dir. cp ./node-data/vcr/trusted_issuers.yaml ./node-backup/vcr/ cp -r ./node-data/crypto ./node-backup -runOnAlpine "$(pwd):/host/" rm -rf /host/node-data +rm -rf ./node-data +#runOnAlpine "$(pwd):/host/" rm -rf /host/node-data mkdir ./node-data removeNodeDID ./node-A/nuts.yaml # Restart node, assert node data is empty