From 7dfed9e632b895250be94182145aca8047217131 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 28 Jun 2017 13:38:38 +0200 Subject: [PATCH] try newer docker-compose --- .gitlab-ci.yml | 2 +- docker-compose.yml | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e905fd2..8c1e0f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index 68683b1..3cf77bf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: \ No newline at end of file