1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00

try newer docker-compose

This commit is contained in:
Steffen Vogel 2017-06-28 13:38:38 +02:00
parent 0191f81486
commit 7dfed9e632
2 changed files with 5 additions and 10 deletions

View file

@ -51,7 +51,7 @@ deploy_review:
DOCKER_CERT_PATH: "certs"
before_script:
- apk add --no-cache py-pip
- pip install docker-compose==1.13.0
- pip install docker-compose
- mkdir -p $DOCKER_CERT_PATH
- echo "$DEPLOYMENT_CACERT" > $DOCKER_CERT_PATH/ca.pem
- echo "$DEPLOYMENT_CLIENT_CERT" > $DOCKER_CERT_PATH/cert.pem

View file

@ -49,8 +49,8 @@ services:
broker:
image: rabbitmq:management
environment:
- RABBITMQ_DEFAULT_USER=villas
- RABBITMQ_DEFAULT_PASS=s3c0sim4!
RABBITMQ_DEFAULT_USER: "villas"
RABBITMQ_DEFAULT_PASS: "s3c0sim4!"
ports:
- "8080:15672"
- "5672:5672"
@ -61,9 +61,7 @@ services:
node:
image: villas/node:latest
privileged: true
command:
- "node"
- "/etc/villas/node/websocket.conf"
command: node /etc/villas/node/websocket.conf
expose:
- "12000/udp"
ports:
@ -78,11 +76,8 @@ services:
image: villas/node:latest
privileged: true
entrypoint: bash
command:
- "-c"
- "villas signal mixed -v4 | villas pipe -x /etc/villas/node/websocket.conf udp_1"
command: -c 'villas signal mixed -v4 | villas pipe -x /etc/villas/node/websocket.conf udp_1'
volumes:
- "./etc/node/:/etc/villas/node/"
stop_signal: SIGINT
networks:
villas: