Se organiza y edita nombres de dockers en docker-compose. Se agrega el cablemodem_command_worker al Release.php Volver a levantar los docker renombrados.

docker-compose.yml

@@ -85,7 +85,6 @@ services:
       HTTPS_METHOD: nohttps
       OAUTH_CLIENT_ID : 1_3323sq6urn8kwccg8s4ok848ggwwgkw4c08wsc4cwkc08osocc
       OAUTH_CLIENT_SECRET : 5w7gx6ptdoo4g8cwwo88o8gowosgco84sso08ssow0osg88g8k
-
     volumes:
       - ./mapas/:/opt/mapas/
 
@@ -174,6 +173,11 @@ services:
       - ./mysql/:/var/lib/mysql/
     image: mysql:5.7
 
+  mongodb:
+    volumes:
+      - ./mongodb:/data/db
+    image: mongo:3.4
+  
   amqp:
     restart: always
     image: rabbitmq:3-management
@@ -181,100 +185,6 @@ services:
     ports:
       - "8072:15672"
 
-  ftth_worker:
-    restart: always
-    image: fd3-ftth
-    build:
-      context: ./ftth
-    command: bin/console rabbitmq:consumer flowdat_tasklogger
-    restart: always
-    links:
-      - mysql:mysql
-      - base:base
-      - amqp:amqp
-      - nginx-proxy:base.fd3.flowdat.com
-    environment:
-      HOST_FTTH: ftth.fd3.flowdat.com
-      HOST_BASE: base.fd3.flowdat.com
-      OAUTH_CLIENT_ID: 1_4gs3n2b9s7mso00kgogoks4k0ogk0ggs0w0k4k484gkowcg08k
-      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
-      AMQP_KEY: ftth
-    volumes:
-      - ./ftth/:/opt/ftth/
-    env_file:
-      - host.env
-
-  command_consumer_worker:
-    restart: always
-    image: fd3-ftth
-    build:
-      context: ./ftth
-    command: bin/console rabbitmq:consumer command_consumer
-    restart: always
-    links:
-      - mysql:mysql
-      - base:base
-      - amqp:amqp
-      - nginx-proxy:base.fd3.flowdat.com
-    environment:
-      HOST_FTTH: ftth.fd3.flowdat.com
-      HOST_BASE: base.fd3.flowdat.com
-      OAUTH_CLIENT_ID: 1_4gs3n2b9s7mso00kgogoks4k0ogk0ggs0w0k4k484gkowcg08k
-      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
-      AMQP_KEY: ftth
-    volumes:
-      - ./ftth/:/opt/ftth/
-    env_file:
-      - host.env
-
-  stats_command_worker:
-    restart: always
-    image: docker.infra.flowdat.com/fd3/stats:latest
-    build:
-      context: ./stats
-    command: bin/console rabbitmq:consumer command_consumer
-    restart: always
-    links:
-      - mysql:mysql
-      - base:base
-      - amqp:amqp
-      - nginx-proxy:base.fd3.flowdat.com
-      - geoserver:geoserver
-      - nginx-proxy:geoserver.fd3.flowdat.com
-    environment:
-      HOST_STATS: stats.fd3.flowdat.com
-      HOST_FTTH: ftth.fd3.flowdat.com
-      HOST_BASE: base.fd3.flowdat.com
-      OAUTH_CLIENT_ID: 1_4gs3n2b9s7mso00kgogoks4k0ogk0ggs0w0k4k484gkowcg08k
-      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
-      AMQP_KEY: stats
-    volumes:
-      - ./stats:/opt/stats
-      - ./geoserver/geoserver-shapes:/var/www/shapes
-    env_file:
-      - host.env
-
-  log_consumer_worker:
-    restart: always
-    image: docker.infra.flowdat.com/fd3/base:latest
-    build:
-      context: ./base
-    command: bin/console rabbitmq:consumer log_consumer
-    links:
-      - mysql:mysql
-      - base:base
-      - amqp:amqp
-      - nginx-proxy:base.fd3.flowdat.com
-    env_file:
-      - host.env
-    environment:
-      OAUTH_CLIENT_ID: 1_4gs3n2b9s7mso00kgogoks4k0ogk0ggs0w0k4k484gkowcg08k
-      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
-      AMQP_KEY: base
-    volumes:
-      - ./base/:/opt/base/
-    
-
   phpmyadmin:
     restart: always
     image: phpmyadmin/phpmyadmin
@@ -286,7 +196,6 @@ services:
     ports:
       - 8080:80
 
-
   grafana:
     restart: always
     image: grafana/grafana:master
@@ -310,7 +219,6 @@ services:
       GF_AUTH_ANONYMOUS_ORG_ROLE: 'Viewer'
       GF_AUTH_ANONYMOUS_ENABLED: "true"
 
-
   jsonendpoint:
     restart: always
     image: fd3_simple_json_endpoint
@@ -340,7 +248,6 @@ services:
     volumes:
       - ./extra/statsd/endpoint/mysql:/opt/datasource
 
-
   mongodb_jsonendpoint:
     restart: always
     image: fd3_simple_json_endpoint_mongo
@@ -353,7 +260,6 @@ services:
     volumes:
       - ./extra/statsd/endpoint/mongodb:/opt/datasource
 
-
   mongo_express:
     image: mongo-express
     ports:
@@ -361,11 +267,6 @@ services:
     links:
       - mongodb:mongo
 
-  mongodb:
-    volumes:
-      - ./mongodb:/data/db
-    image: mongo:3.4
-
   statsd:
     restart: always
     image: fd3-statsd-mysql-backend
@@ -437,7 +338,125 @@ services:
     image: redis:latest
     restart: always
 
-  command_consumer_worker_cm:
+  base_log_worker:
+    restart: always
+    image: fd3-base
+    build:
+      context: ./base
+    command: bin/console rabbitmq:consumer log_consumer
+    restart: always
+    links:
+      - mysql:mysql
+      - base:base
+      - amqp:amqp
+      - nginx-proxy:base.fd3.flowdat.com
+    environment:
+      HOST_BASE: base.fd3.flowdat.com
+      OAUTH_CLIENT_ID: 1_4gs3n2b9s7mso00kgogoks4k0ogk0ggs0w0k4k484gkowcg08k
+      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
+      AMQP_KEY: base
+    volumes:
+      - ./base/:/opt/base/
+    env_file:
+      - host.env
+  
+  ftth_tasklogger_worker:
+    restart: always
+    image: fd3-ftth
+    build:
+      context: ./ftth
+    command: bin/console rabbitmq:consumer flowdat_tasklogger
+    restart: always
+    links:
+      - mysql:mysql
+      - base:base
+      - amqp:amqp
+      - nginx-proxy:base.fd3.flowdat.com
+    environment:
+      HOST_FTTH: ftth.fd3.flowdat.com
+      HOST_BASE: base.fd3.flowdat.com
+      OAUTH_CLIENT_ID: 1_4gs3n2b9s7mso00kgogoks4k0ogk0ggs0w0k4k484gkowcg08k
+      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
+      AMQP_KEY: ftth
+    volumes:
+      - ./ftth/:/opt/ftth/
+    env_file:
+      - host.env
+  
+  cablemodem_tasklogger_worker:
+    restart: always
+    image: fd3-cablemodem
+    build:
+      context: ./cablemodem
+    command: bin/console rabbitmq:consumer flowdat_tasklogger
+    restart: always
+    links:
+      - mysql:mysql
+      - base:base
+      - amqp:amqp
+      - nginx-proxy:base.fd3.flowdat.com
+    environment:
+      HOST_CABLEMODEM: cablemodem.fd3.flowdat.com
+      HOST_BASE: base.fd3.flowdat.com
+      OAUTH_CLIENT_ID: 1_4gs3n2b9s7mso00kgogoks4k0ogk0ggs0w0k4k484gkowcg08k
+      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
+      AMQP_KEY: cablemodem
+    volumes:
+      - ./cablemodem/:/opt/cablemodem/
+    env_file:
+      - host.env
+
+  ftth_command_worker:
+    restart: always
+    image: fd3-ftth
+    build:
+      context: ./ftth
+    command: bin/console rabbitmq:consumer command_consumer
+    restart: always
+    links:
+      - mysql:mysql
+      - base:base
+      - amqp:amqp
+      - nginx-proxy:base.fd3.flowdat.com
+    environment:
+      HOST_FTTH: ftth.fd3.flowdat.com
+      HOST_BASE: base.fd3.flowdat.com
+      OAUTH_CLIENT_ID: 1_4gs3n2b9s7mso00kgogoks4k0ogk0ggs0w0k4k484gkowcg08k
+      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
+      AMQP_KEY: ftth
+    volumes:
+      - ./ftth/:/opt/ftth/
+    env_file:
+      - host.env
+
+  stats_command_worker:
+    restart: always
+    image: docker.infra.flowdat.com/fd3/stats:latest
+    build:
+      context: ./stats
+    command: bin/console rabbitmq:consumer command_consumer
+    restart: always
+    links:
+      - mysql:mysql
+      - base:base
+      - amqp:amqp
+      - nginx-proxy:base.fd3.flowdat.com
+      - geoserver:geoserver
+      - nginx-proxy:geoserver.fd3.flowdat.com
+    environment:
+      HOST_STATS: stats.fd3.flowdat.com
+      HOST_FTTH: ftth.fd3.flowdat.com
+      HOST_BASE: base.fd3.flowdat.com
+      OAUTH_CLIENT_ID: 1_4gs3n2b9s7mso00kgogoks4k0ogk0ggs0w0k4k484gkowcg08k
+      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
+      AMQP_KEY: stats
+    volumes:
+      - ./stats:/opt/stats
+      - ./geoserver/geoserver-shapes:/var/www/shapes
+    env_file:
+      - host.env
+
+  cablemodem_command_worker:
     restart: always
     image: fd3-cablemodem
     build:

tools/src/Release.php

@@ -809,20 +809,6 @@ class Release extends Command
         ->addEnviroment("AMQP_KEY", "base")
         ->addVolumes("./base/", "/opt/base");
 
-        $composer
-        ->addService("ftth_command_worker")
-        ->image($registry . "fd3/ftth:" . $version)
-        ->build("./ftth/")
-        ->command("bin/console rabbitmq:consumer command_consumer")
-        ->restart($this->_docker_restart_default)
-        ->addLinks("mysql")
-        ->addLinks("base")
-        ->addLinks("amqp")
-        ->addLinks("nginx", $this->getDomain("base"))
-        ->addEnv_file("running.env")
-        ->addEnviroment("AMQP_KEY", "ftth")
-        ->addVolumes("./ftth/", "/opt/ftth");
-
         $composer
         ->addService("ftth_tasklogger_worker")
         ->image($registry . "fd3/ftth:" . $version)
@@ -853,6 +839,20 @@ class Release extends Command
         ->addEnviroment("AMQP_KEY", "cablemodem")
         ->addVolumes("./cablemodem/", "/opt/cablemodem");
 
+        $composer
+        ->addService("ftth_command_worker")
+        ->image($registry . "fd3/ftth:" . $version)
+        ->build("./ftth/")
+        ->command("bin/console rabbitmq:consumer command_consumer")
+        ->restart($this->_docker_restart_default)
+        ->addLinks("mysql")
+        ->addLinks("base")
+        ->addLinks("amqp")
+        ->addLinks("nginx", $this->getDomain("base"))
+        ->addEnv_file("running.env")
+        ->addEnviroment("AMQP_KEY", "ftth")
+        ->addVolumes("./ftth/", "/opt/ftth");
+
         $composer
         ->addService("stats_command_worker")
         ->image($registry . "fd3/stats:" . $version)
@@ -869,8 +869,21 @@ class Release extends Command
         ->addEnv_file("host.env")
         ->addEnviroment("AMQP_KEY", "stats")
         ->addVolumes("./stats/", "/opt/stats")
-        ->addVolumes("./geoserver/geoserver-shapes", "/var/www/shapes")
-        ;
+        ->addVolumes("./geoserver/geoserver-shapes", "/var/www/shapes");
+
+        $composer
+        ->addService("cablemodem_command_worker")
+        ->image($registry . "fd3/cablemodem:" . $version)
+        ->build("./cablemodem/")
+        ->command("bin/console rabbitmq:consumer command_consumer")
+        ->restart($this->_docker_restart_default)
+        ->addLinks("mysql")
+        ->addLinks("base")
+        ->addLinks("amqp")
+        ->addLinks("nginx", $this->getDomain("base"))
+        ->addEnv_file("running.env")
+        ->addEnviroment("AMQP_KEY", "cablemodem")
+        ->addVolumes("./cablemodem/", "/opt/cablemodem");
     }
 
     /**