From e2ec47991337e421afac9f74e0376e4c47f5a95f Mon Sep 17 00:00:00 2001
From: Jonathan Math <jonathanamath@gmail.com>
Date: Mon, 8 Mar 2021 14:14:15 -0500
Subject: [PATCH] add db_ to db container names

---
 docker-compose.yml                    | 33 ++++++++++++---------------
 newsblur_web/docker_local_settings.py | 18 +++++++--------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 48525458c..e4995ade4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,17 +10,12 @@ services:
       - DOCKERBUILD=True
     stdin_open: true
     tty: true
-    links:
-      - db_mongo
-      - postgres
-      - elasticsearch
-      - redis
     restart: always
     depends_on:
       - db_mongo
-      - postgres
-      - redis
-      - elasticsearch
+      - db_postgres
+      - db_redis
+      - db_elasticsearch
     ulimits:
       nproc: 10000
       nofile:
@@ -40,10 +35,10 @@ services:
     depends_on:
     - newsblur_web
     - favicons
-    - postgres
-    - redis
+    - db_postgres
+    - db_redis
     - db_mongo
-    - elasticsearch
+    - db_elasticsearch
     - original_pages
     - original_text
     - node_websocket
@@ -53,8 +48,8 @@ services:
     - ./docker/nginx/nginx.local.conf:/etc/nginx/conf.d/nginx.conf
     - app-files:/srv/newsblur
 
-  postgres:
-    container_name: postgres
+  db_postgres:
+    container_name: db_postgres
     image: postgres:13.1
     environment:
       - POSTGRES_USER=newsblur
@@ -64,11 +59,11 @@ services:
     volumes:
       - ./docker/volumes/postgres:/var/lib/postgresql/data
 
-  redis:
+  db_redis:
     image: redis:3.2.6
     ports:
       - '6579:6579'
-    container_name: redis
+    container_name: db_redis
     volumes:
       - ./docker/volumes/redis:/data
       - ./config/redis.conf:/usr/local/etc/redis_server.conf
@@ -76,8 +71,8 @@ services:
       - ./docker/volumes/redis.var.lib:/var/lib/redis
     command: redis-server --port 6579
 
-  elasticsearch:
-    container_name: elasticsearch
+  db_elasticsearch:
+    container_name: db_elasticsearch
     image: elasticsearch:2.4.4
     ports:
       - '9200:9200'
@@ -124,7 +119,7 @@ services:
       - 3030:3030
     command: node favicons.js
     depends_on: 
-      - postgres
+      - db_postgres
     volumes: 
       - node-files:/usr/src/app
 
@@ -234,7 +229,7 @@ services:
     depends_on: 
       - nginx
       - newsblur_web
-      - redis
+      - db_redis
     ports:
       - 80:80
       - 443:443
diff --git a/newsblur_web/docker_local_settings.py b/newsblur_web/docker_local_settings.py
index 8a8ece8ff..0655fedf8 100644
--- a/newsblur_web/docker_local_settings.py
+++ b/newsblur_web/docker_local_settings.py
@@ -33,7 +33,7 @@ ENFORCE_SIGNUP_CAPTCHA = False
 CACHES = {
     'default': {
         'BACKEND': 'redis_cache.RedisCache',
-        'LOCATION': 'redis:6579',
+        'LOCATION': 'db_redis:6579',
         'OPTIONS': {
             'DB': 6,
             'PARSER_CLASS': 'redis.connection.HiredisParser'
@@ -80,7 +80,7 @@ DATABASES = {
         #'ENGINE': 'django.db.backends.mysql',
         'USER': 'newsblur',
         'PASSWORD': 'newsblur',
-        'HOST': 'postgres',
+        'HOST': 'db_postgres',
         'PORT': 5432
     },
 }
@@ -100,31 +100,31 @@ MONGODB_SLAVE = {
 }
 
 # Celery RabbitMQ/Redis Broker
-BROKER_URL = "redis://redis:6579/0"
+BROKER_URL = "redis://db_redis:6579/0"
 CELERY_RESULT_BACKEND = BROKER_URL
 
 REDIS = {
-    'host': 'redis',
+    'host': 'db_redis',
     'port': 6579
 }
 REDIS_PUBSUB = {
-    'host': 'redis',
+    'host': 'db_redis',
     'port': 6579
 }
 REDIS_STORY = {
-    'host': 'redis',
+    'host': 'db_redis',
     'port': 6579
 }
 REDIS_SESSIONS = {
-    'host': 'redis',
+    'host': 'db_redis',
     'port': 6579
 }
 
 CELERY_REDIS_DB_NUM = 4
 SESSION_REDIS_DB = 5
 
-ELASTICSEARCH_FEED_HOSTS = ["elasticsearch:9200"]
-ELASTICSEARCH_STORY_HOSTS = ["elasticsearch:9200"]
+ELASTICSEARCH_FEED_HOSTS = ["db_elasticsearch:9200"]
+ELASTICSEARCH_STORY_HOSTS = ["db_elasticsearch:9200"]
 
 BACKED_BY_AWS = {
     'pages_on_node': False,