Refact dev & staging docker compose file

NUAA-Open-Source · Aug 11, 2019 · add3554 · add3554
1 parent 49dec01
commit add3554
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 56 deletions.
diff --git a/conf/db.example.json b/conf/db.example.json
@@ -3,16 +3,16 @@
     "User": "your_db_username",
     "Pass": "your_db_password",
     "Host": "your_db_ip_address",
-    "Port": "3306",
+    "Port": "your_db_port",
     "Database": "safeu",
     "MaxIdleConns": 30,
     "MaxOpenConns": 100,
     "ConnMaxLifetime":3600,
     "Debug": false
   },
   "Redis": {
-    "Host": "safeu-redis",
-    "Port": "6379",
-    "Pass": ""
+    "Host": "your_redis_ip_address",
+    "Port": "your_redis_port",
+    "Pass": "your_redis_password"
   }
 }
diff --git a/conf/redis/redis.conf b/conf/redis/redis.conf
@@ -1,16 +1,16 @@
-notify-keyspace-events "Ex"
-# requirepass "safeu"
-save 60 100
-save 900 1
-save 300 10
-stop-writes-on-bgsave-error no
-rdbcompression yes
-dbfilename dump.rdb
-
-appendonly no
-appendfsync everysec
-no-appendfsync-on-rewrite no
-auto-aof-rewrite-percentage 100
-auto-aof-rewrite-min-size 64mb
-
-dir /data
+notify-keyspace-events "Ex"
+# requirepass "safeu"
+save 60 100
+save 900 1
+save 300 10
+stop-writes-on-bgsave-error no
+rdbcompression yes
+dbfilename dump.rdb
+
+appendonly no
+appendfsync everysec
+no-appendfsync-on-rewrite no
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+
+dir /data
diff --git a/deployments/dev-safeu/docker-compose.yml b/deployments/dev-safeu/docker-compose.yml
@@ -28,9 +28,9 @@ services:
       - "9000:8080"
     networks:
       - safeu-app-net
-    depends_on:
+    # depends_on:
 #      - db
-      - safeu-redis
+      # - safeu-redis
     restart: always
 
 #  db:
@@ -48,20 +48,20 @@ services:
 #    networks:
 #      - safeu-app-net
 #    restart: on-failure
-    
-  safeu-redis:
-    image: redis:5.0.3-alpine
-    environment:
-      - TZ=Asia/Shanghai
-    volumes:
-      - ../../conf/redis/redis.conf:/usr/local/etc/redis/redis.conf
-      - ../../data-dev/redis:/data # for redis persistent storage
-    entrypoint: redis-server /usr/local/etc/redis/redis.conf
-    ports:
-      - "6379:6379"
-    networks:
-      - safeu-app-net
-    restart: on-failure
+
+  # safeu-redis:
+  #   image: redis:5.0.3-alpine
+  #   environment:
+  #     - TZ=Asia/Shanghai
+  #   volumes:
+  #     - ../../conf/redis/redis.conf:/usr/local/etc/redis/redis.conf
+  #     - ../../data-dev/redis:/data # for redis persistent storage
+  #   entrypoint: redis-server /usr/local/etc/redis/redis.conf
+  #   ports:
+  #     - "6379:6379"
+  #   networks:
+  #     - safeu-app-net
+  #   restart: on-failure
 
 networks:
   safeu-app-net:
diff --git a/deployments/staging-safeu/docker-compose.yml b/deployments/staging-safeu/docker-compose.yml
@@ -30,8 +30,8 @@ services:
       - "8090:8080"
     networks:
       - safeu-app-net
-    depends_on:
-      - safeu-redis
+    # depends_on:
+    #   - safeu-redis
     restart: on-failure
 
   safeu2:
@@ -47,8 +47,8 @@ services:
       - "8091:8080"
     networks:
       - safeu-app-net
-    depends_on:
-      - safeu-redis
+    # depends_on:
+    #   - safeu-redis
     restart: on-failure
 
   safeu3:
@@ -64,8 +64,8 @@ services:
       - "8092:8080"
     networks:
       - safeu-app-net
-    depends_on:
-      - safeu-redis
+    # depends_on:
+    #   - safeu-redis
     restart: on-failure
 
 #  db:
@@ -82,20 +82,20 @@ services:
 #    networks:
 #      - dbnet
 #    restart: on-failure
-  safeu-redis:
-    image: redis:5.0.3-alpine
-    environment:
-      - TZ=Asia/Shanghai
-    volumes:
-      - ../../conf/redis/redis.conf:/usr/local/etc/redis/redis.conf
-      - ../../data/redis:/data # for redis persistent storage
-    entrypoint: redis-server /usr/local/etc/redis/redis.conf
-    # no reveal for ports, waiting for the database instance
-    # ports:
-    #   - "6379:6379"
-    networks:
-      - safeu-app-net
-    restart: on-failure
+  # safeu-redis:
+  #   image: redis:5.0.3-alpine
+  #   environment:
+  #     - TZ=Asia/Shanghai
+  #   volumes:
+  #     - ../../conf/redis/redis.conf:/usr/local/etc/redis/redis.conf
+  #     - ../../data/redis:/data # for redis persistent storage
+  #   entrypoint: redis-server /usr/local/etc/redis/redis.conf
+  #   # no reveal for ports, waiting for the database instance
+  #   # ports:
+  #   #   - "6379:6379"
+  #   networks:
+  #     - safeu-app-net
+  #   restart: on-failure
 
 networks:
   safeu-app-net: