File tree Expand file tree Collapse file tree 4 files changed +15
-7
lines changed
e2e-tests/oauth-flow/rfc021 Expand file tree Collapse file tree 4 files changed +15
-7
lines changed Original file line number Diff line number Diff line change @@ -11,7 +11,9 @@ db_dc="docker compose -f docker-compose.yml -f ${1}.yml"
11
11
echo " ------------------------------------"
12
12
echo " Cleaning up running Docker containers and volumes, and key material..."
13
13
echo " ------------------------------------"
14
- $db_dc down
14
+ # --remove-orphans to ensure that DB containers of previous runs (on e.g. Postgres) are removed when testing with SQLite.
15
+ # Nothing breaks otherwise, but it prevents annoying warnings in the log.
16
+ $db_dc down --remove-orphans
15
17
$db_dc rm -f -v
16
18
17
19
echo " ------------------------------------"
Original file line number Diff line number Diff line change 1
1
services :
2
2
nodeA-backend :
3
3
depends_on :
4
- - db
4
+ db :
5
+ condition : service_healthy
5
6
environment :
6
7
NUTS_STORAGE_SQL_CONNECTION : mysql://root:root@db:3306/node_a?charset=utf8mb4&parseTime=True&loc=Local
7
8
nodeB-backend :
8
9
depends_on :
9
- - db
10
+ db :
11
+ condition : service_healthy
10
12
environment :
11
13
NUTS_STORAGE_SQL_CONNECTION : mysql://root:root@db:3306/node_b?charset=utf8mb4&parseTime=True&loc=Local
12
14
db :
Original file line number Diff line number Diff line change 1
1
services :
2
2
nodeA-backend :
3
3
depends_on :
4
- - db
4
+ db :
5
+ condition : service_healthy
5
6
environment :
6
7
NUTS_STORAGE_SQL_CONNECTION : postgres://postgres:postgres@db:5432/node_a?sslmode=disable
7
8
nodeB-backend :
8
9
depends_on :
9
- - db
10
+ db :
11
+ condition : service_healthy
10
12
environment :
11
13
NUTS_STORAGE_SQL_CONNECTION : postgres://postgres:postgres@db:5432/node_b?sslmode=disable
12
14
db :
Original file line number Diff line number Diff line change 1
1
services :
2
2
nodeA-backend :
3
3
depends_on :
4
- - db
4
+ db :
5
+ condition : service_healthy
5
6
environment :
6
7
NUTS_STORAGE_SQL_CONNECTION : sqlserver://sa:MyStrong(!)Password@db:1433/node_a?sslmode=disable
7
8
nodeB-backend :
8
9
depends_on :
9
- - db
10
+ db :
11
+ condition : service_healthy
10
12
environment :
11
13
NUTS_STORAGE_SQL_CONNECTION : sqlserver://sa:MyStrong(!)Password@db:1433/node_b?sslmode=disable
12
14
db :
You can’t perform that action at this time.
0 commit comments