You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dr...@apache.org on 2017/09/07 20:34:13 UTC

[incubator-openwhisk-devtools] branch master updated: Remove consul and registrator services (#50)

This is an automated email from the ASF dual-hosted git repository.

dragos pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-devtools.git


The following commit(s) were added to refs/heads/master by this push:
     new 74879b5  Remove consul and registrator services (#50)
74879b5 is described below

commit 74879b59f05cdebca5a39f6f510082fb81ff1256
Author: Duy Nguyen <du...@gmail.com>
AuthorDate: Thu Sep 7 22:34:12 2017 +0200

    Remove consul and registrator services (#50)
---
 docker-compose/docker-compose.yml | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 53f44b8..84bbadb 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -29,36 +29,14 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - ~/tmp/openwhisk/kafka:/kafka:rw
 
-  # CONSUL & REGISTRATOR SERVICES
-  consul:
-    image: consul:v0.7.0
-    ports:
-      - "8400:8400" # CLI
-      - "8500:8500" # HTTP
-      - "8600:8600" # DNS
-      - "8302:8302" # Serf LAN
-    environment:
-      CONSUL_LOCAL_CONFIG: '{"log_level":"warn"}'
-  registrator:
-    image: gliderlabs/registrator
-    command: [-resync, "5", "consul://consul.docker:8500"]
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock
-    links:
-      - consul:consul.docker
-    depends_on:
-      - consul
-
   # WHISK CONTROLLER
   controller:
     image: openwhisk/controller:latest
     command: /bin/sh -c "controller/bin/controller 0 >> /logs/controller-local_logs.log 2>&1"
     links:
-      - consul:consul.docker
       - db:db.docker
       - kafka:kafka.docker
     depends_on:
-      - consul
       - db
       - kafka
     env_file:
@@ -67,9 +45,6 @@ services:
       COMPONENT_NAME: controller
       PORT: 8888
 
-      CONSULSERVER_HOST: consul.docker
-      CONSUL_HOST_PORT4: 8500
-
       KAFKA_HOST: kafka.docker
       KAFKA_HOST_PORT: 9092
 
@@ -92,11 +67,9 @@ services:
     image: openwhisk/invoker:latest
     command: /bin/sh -c "/invoker/bin/invoker 0 >> /logs/invoker-local_logs.log 2>&1"
     links:
-      - consul:consul.docker
       - db:db.docker
       - kafka:kafka.docker
     depends_on:
-      - consul
       - db
       - kafka
     env_file:
@@ -106,9 +79,6 @@ services:
       SERVICE_NAME: invoker0
       PORT: 8085
 
-      CONSULSERVER_HOST: consul.docker
-      CONSUL_HOST_PORT4: 8500
-
       KAFKA_HOST: kafka.docker
       KAFKA_HOST_PORT: 9092
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].