Skip to content

Commit

Permalink
host and container use same user 1 e2e-test
Browse files Browse the repository at this point in the history
  • Loading branch information
gerardsn committed Mar 22, 2024
1 parent 16f426f commit 229aa56
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions e2e-tests/storage/backup-restore/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
services:
nodeA:
user: "$USER:$USER"
image: "${IMAGE_NODE_A:-nutsfoundation/nuts-node:master}"
environment:
NUTS_CONFIGFILE: /opt/nuts/nuts.yaml
Expand Down
1 change: 1 addition & 0 deletions e2e-tests/storage/backup-restore/node-A/nuts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ url: "http://nodeA"
verbosity: debug
strictmode: false
internalratelimiter: false
datadir: /data
http:
internal:
address: :8081
Expand Down
8 changes: 5 additions & 3 deletions e2e-tests/storage/backup-restore/run-test.sh
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
#!/usr/bin/env bash

source ../../util.sh
USER=$UID
echo $USER

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 "------------------------------------"
Expand Down

0 comments on commit 229aa56

Please sign in to comment.