Merge pull request #323 from steemit/redis-conf-update

update docker-compose.yaml about redis config

.gitignore

@@ -125,3 +125,9 @@ tests/failed_blocks/
 /deploy/
 /scripts/hive.sqlite
 .vscode
+
+# docker
+redis_data/*
+postgres_data/*
+!redis_data/.gitkeep
+!postgres_data/.gitkeep

README.md

@@ -85,6 +85,7 @@ docker logs -f hivemind
 | `HTTP_SERVER_PORT`       | `--http-server-port` | 8080    |
 | `DATABASE_URL`           | `--database-url`     | postgresql://user:pass@localhost:5432/hive |
 | `STEEMD_URL`             | `--steemd-url`       | https://api.steemit.com |
+| `REDIS_URL`              | `--redis-url`        | redis://localhost:6379/ |
 | `MAX_BATCH`              | `--max-batch`        | 50      |
 | `MAX_WORKERS`            | `--max-workers`      | 4       |
 | `TRAIL_BLOCKS`           | `--trail-blocks`     | 2       |

dev_env.sh

@@ -1,5 +1,7 @@
 #/bin/bash
 
+set -xe
+
 container_name=dev-hivemind-env
 
 run() {
@@ -10,16 +12,16 @@ run() {
         tag=dev-env
     fi
 
-    if [ -n ${network} ]; then
-        network_str="--network ${network}"
+    if [ "${network}" = "" ]; then
+        network=bridge
     fi
 
-    docker run -it --rm \
+    docker run -itd --rm \
         --name ${container_name} \
         -v $(pwd):/project \
         --env-file $(pwd)/.env \
         --workdir /project \
-        ${network_str} \
+        --network ${network} \
         steemit/hivemind:${tag} \
         /bin/bash
 }
@@ -40,6 +42,7 @@ main_func() {
     case ${op} in
         run)
             run $tag $network
+            cli
             ;;
         cli)
             cli

docker-compose.yml

@@ -6,21 +6,27 @@ services:
       POSTGRES_USER: testuser
       POSTGRES_PASSWORD: testuserpass
       POSTGRES_DB: testdb
-    ports:
-     - 3306:3306
+    volumes:
+      - ./postgres_data:/var/lib/postgresql/data
+    restart: always
+  redis:
+    image: redis
+    volumes:
+      - ./redis_data:/data
+    restart: always
   hive:
     depends_on:
       - db
-    image: steemit/hive
-    build: .
+      - redis
+    image: steemit/hivemind:latest
     environment:
-      DATABASE_URL: postgresql://testuser:testuserpass@db:5432/testdb
       LOG_LEVEL: INFO
+      DATABASE_URL: postgresql://testuser:testuserpass@db:5432/testdb
       STEEMD_URL: https://api.steemit.com
+      REDIS_URL: redis://redis:6379
     links:
       - db:db
+      - redis:redis
     ports:
       - 8080:8080
-    volumes:
-      - .:/app
     restart: always