docker-compose-local.yml now extends docker-compose.yml

WebWolf waits for 8 seconds after WebGoat starts so the database connection can be established
This commit is contained in:
Nanne Baars
2018-08-08 18:26:12 +02:00
parent bca8b3c650
commit 3d58049af6
3 changed files with 11 additions and 16 deletions

View File

@ -3,16 +3,11 @@ version: '2.1'
services:
webgoat:
image: webgoat/webgoat-v8.0.0.snapshot
environment:
- WEBWOLF_HOST=webwolf
- WEBWOLF_PORT=9090
ports:
- "8080:8080"
volumes:
- .:/home/webgoat/.webgoat
command: "java -Djava.security.egd=file:/dev/./urandom -jar /home/webgoat/webgoat.jar --server.address=0.0.0.0 --server.port=8080"
extends:
file: docker-compose.yml
service: webgoat
webwolf:
image: webgoat/webwolf-v8.0.0.snapshot
ports:
- "9090:9090"
command: bash -c "sleep 8 && java -Djava.security.egd=file:/dev/./urandom -jar /home/webwolf/webwolf.jar --server.port=9090 --server.address=0.0.0.0 --spring.datasource.url=jdbc:hsqldb:hsql://webgoat:9001/webgoat"
extends:
file: docker-compose.yml
service: webwolf
image: webgoat/webwolf-v8.0.0.snapshot