sync docker compose service names with k8s service names

hysds · Oct 7, 2018 · 4629ad7 · 4629ad7
1 parent d2d9393
commit 4629ad7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -108,7 +108,7 @@ docker tag hysds/mozart:<YYYYMMDD> hysds/mozart:latest
 
 3. Run mozart via docker:
 ```
-docker run -d --hostname mozart --name mozart --link mozart-rabbit:rabbit \
+docker run -d --hostname mozart --name mozart --link mozart-rabbitmq:rabbitmq \
        --link mozart-redis:redis --link mozart-elasticsearch:elasticsearch -p 80:80 \
        -p 443:443 -p 5555:5555 -p 8888:8888 -p 9001:9001 -v /sys/fs/cgroup:/sys/fs/cgroup:ro \
        -v /data/mozart/etc:/home/ops/mozart/etc -v /data/mozart/log:/home/ops/mozart/log \

diff --git a/cluster/data/celeryconfig.py b/cluster/data/celeryconfig.py
@@ -1,4 +1,4 @@
-BROKER_URL = "amqp://guest@mozart-rabbit:5672//"
+BROKER_URL = "amqp://guest@mozart-rabbitmq:5672//"
 CELERY_RESULT_BACKEND = "redis://mozart-redis"
 
 CELERY_TASK_SERIALIZER = "msgpack"
@@ -31,7 +31,7 @@
 ADMINS = (
     ('"Gerald Manipon"', 'pymonger@gmail.com'),
 )
-SERVER_EMAIL = 'ops@mozart-rabbit'
+SERVER_EMAIL = 'ops@mozart-rabbitmq'
 
 HYSDS_HANDLE_SIGNALS = False
 HYSDS_JOB_STATUS_EXPIRES = 86400
@@ -41,7 +41,7 @@
 
 PYMONITOREDRUNNER_CFG = {
     "rabbitmq": {
-        "hostname": "mozart-rabbit",
+        "hostname": "mozart-rabbitmq",
         "port": 5672,
         "queue": "stdouterr"
     },

diff --git a/cluster/docker-compose.yml b/cluster/docker-compose.yml
@@ -26,17 +26,17 @@ services:
     volumes_from:
       - mozart-redis
     links:
-      - mozart-rabbit
+      - mozart-rabbitmq
       - mozart-redis
       - mozart-elasticsearch
     depends_on:
-      - mozart-rabbit
+      - mozart-rabbitmq
       - mozart-redis
       - mozart-elasticsearch
-  mozart-rabbit:
+  mozart-rabbitmq:
     image: hysds/rabbitmq
-    hostname: mozart-rabbit
-    container_name: mozart-rabbit
+    hostname: mozart-rabbitmq
+    container_name: mozart-rabbitmq
     ports:
       - "15672:5672"
       - "25672:15672"

diff --git a/configs/mozart-docker-entrypoint.sh b/configs/mozart-docker-entrypoint.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-# wait for rabbit, redis, and ES
-/wait-for-it.sh -t 30 mozart-rabbit:15672
+# wait for rabbitmq, redis, and ES
+/wait-for-it.sh -t 30 mozart-rabbitmq:15672
 /wait-for-it.sh -t 30 mozart-redis:6379
 /wait-for-it.sh -t 30 mozart-elasticsearch:9200
 

diff --git a/mozart/docker-compose.yml b/mozart/docker-compose.yml
@@ -24,13 +24,13 @@ services:
     volumes_from:
       - redis
     links:
-      - rabbit
+      - rabbitmq
       - redis
       - elasticsearch
-  rabbit:
+  rabbitmq:
     image: hysds/rabbitmq
-    hostname: mozart-rabbit
-    container_name: mozart-rabbit
+    hostname: mozart-rabbitmq
+    container_name: mozart-rabbitmq
     ports:
       - "5672:5672"
       - "15672:15672"