Update NeoScan (#56)

CityOfZion · Oct 1, 2018 · 46e787b · 46e787b
1 parent eddfc33
commit 46e787b
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 17 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.8.1
+0.8.2
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,12 +4,12 @@ services:
   neo-faucet:
     container_name: neo-faucet
     depends_on:
-      - neo-scan
+      - neo-scan-api
     environment:
-      NEOSCAN: "neo-scan:4000"
+      NEOSCAN: "neo-scan-api:4000"
     image: cityofzion/neo-local-faucet
     links:
-      - "neo-scan:4000"
+      - "neo-scan-api:4000"
     ports:
       - "4002:4002"
 
@@ -30,36 +30,60 @@ services:
     container_name: neo-python
     depends_on:
       - neo-nodes
-      - neo-scan
+      - neo-scan-api
+      - neo-scan-sync
     image: cityofzion/neo-python:v0.7.7
     network_mode: host
     tty: true
     volumes:
       - "./smart-contracts:/smart-contracts"
       - "./wallets:/wallets"
 
-  neo-scan:
-    container_name: neo-scan
+  neo-scan-sync:
+    container_name: neo-scan-sync
     depends_on:
       - postgres
       - neo-nodes
       - notifications-server
     environment:
-      HOST: "${HOST_NAME}"
       NEO_NOTIFICATIONS_SERVER: "http://${NOTIFICATIONS_SERVER}:8080/v1"
-      NEO_SEED_1: "http://${SEED_SERVER}:30333"
-      NEO_SEED_2: "http://${SEED_SERVER}:30334"
-      NEO_SEED_3: "http://${SEED_SERVER}:30335"
-      NEO_SEED_4: "http://${SEED_SERVER}:30336"
-      PORT: 4000
-    image: registry.gitlab.com/cityofzion/neo-scan
+      NEO_SEEDS: "http://${SEED_SERVER}:30333;http://${SEED_SERVER}:30334;http://${SEED_SERVER}:30335;http://${SEED_SERVER}:30336"
+      DB_HOSTNAME: postgres
+      DB_USERNAME: postgres
+      DB_PASSWORD: postgres
+      DB_DATABASE: neoscan_prodv
+      REPLACE_OS_VARS: "true"
+    image: registry.gitlab.com/cityofzion/neo-scan/sync
     links:
       - "neo-nodes:30333"
       - "neo-nodes:30334"
       - "neo-nodes:30335"
       - "neo-nodes:30336"
+
+  neo-scan-api:
+    container_name: neo-scan-api
+    depends_on:
+    - postgres
+    - neo-nodes
+    - notifications-server
+    environment:
+      HOST: "${HOST_NAME}"
+      NEO_NOTIFICATIONS_SERVER: "http://${NOTIFICATIONS_SERVER}:8080/v1"
+      NEO_SEEDS: "http://${SEED_SERVER}:30333;http://${SEED_SERVER}:30334;http://${SEED_SERVER}:30335;http://${SEED_SERVER}:30336"
+      PORT: 4000
+      DB_HOSTNAME: postgres
+      DB_USERNAME: postgres
+      DB_PASSWORD: postgres
+      DB_DATABASE: neoscan_prodv
+      REPLACE_OS_VARS: "true"
+    image: registry.gitlab.com/cityofzion/neo-scan/api
+    links:
+    - "neo-nodes:30333"
+    - "neo-nodes:30334"
+    - "neo-nodes:30335"
+    - "neo-nodes:30336"
     ports:
-      - "4000:4000"
+    - "4000:4000"
 
   notifications-server:
     command: "/usr/bin/python3 /neo-python/neo/bin/api_server.py --config /neo-python/custom-config.json --port-rest 8080"
@@ -80,4 +104,4 @@ services:
       POSTGRES_USER: postgres
     expose:
       - 5432
-    image: "postgres:10.1"
+    image: "postgres:10.1"
diff --git a/scripts/status.sh b/scripts/status.sh
@@ -2,7 +2,7 @@
 # Script used within the integration tests to check that all the services are operational.
 
 CURRENT_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-EXPECTED_NUMBER_OF_SERVICES=6
+EXPECTED_NUMBER_OF_SERVICES=7
 
 NUMBER_OF_RUNNING_SERVICES=$(docker-compose ps | grep "Up" | wc -l)