publish v2 watchers

omgnetwork · Dec 10, 2020 · 00f64ce · 00f64ce
1 parent 9443b1c
commit 00f64ce
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -866,7 +866,7 @@ jobs:
     machine:
       image: ubuntu-1604:201903-01
     environment:
-      WATCHER_IMAGE_NAME: "omisego/watcher2"
+      WATCHER_IMAGE_NAME: "omisego/watcher-v2"
     steps:
       - checkout
       - run: make docker-watcher WATCHER_IMAGE_NAME=$WATCHER_IMAGE_NAME
@@ -894,7 +894,7 @@ jobs:
     machine:
       image: ubuntu-1604:201903-01
     environment:
-      WATCHER_INFO_IMAGE_NAME: "omisego/watcher_info2"
+      WATCHER_INFO_IMAGE_NAME: "omisego/watcher_info-v2"
     steps:
       - checkout
       - run: make docker-watcher_info WATCHER_INFO_IMAGE_NAME=$WATCHER_INFO_IMAGE_NAME

diff --git a/Makefile b/Makefile
@@ -79,8 +79,8 @@ list:
 
 all: clean build-watcher-prod build-watcher_info-prod
 
-WATCHER_IMAGE_NAME      ?= "omisego/watcher:latest"
-WATCHER_INFO_IMAGE_NAME ?= "omisego/watcher_info:latest"
+WATCHER_IMAGE_NAME      ?= "omisego/watcher-v2:latest"
+WATCHER_INFO_IMAGE_NAME ?= "omisego/watcher_info-v2:latest"
 
 IMAGE_BUILDER   ?= "omisegoimages/elixir-omg-builder:stable-20200410"
 IMAGE_BUILD_DIR ?= $(PWD)

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,26 +1,76 @@
 version: "2.3"
 services:
   postgres:
-    image: postgres:9.6.13-alpine
+    image: postgres:12.2-alpine
     restart: always
+    container_name: postgres
     ports:
       - "5432:5432"
-    environment:
-      POSTGRES_USER: omisegodev
-      POSTGRES_PASSWORD: omisegodev
     volumes:
       - ./docker/create_databases.sql:/docker-entrypoint-initdb.d/create_databases.sql
-    healthcheck:
-      test: pg_isready -U omisego_dev
-      interval: 5s
-      timeout: 3s
-      retries: 5
+      - ./docker/postgres/data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=omisegodev
+      - POSTGRES_PASSWORD=omisegodev
     networks:
       chain_net:
         ipv4_address: 172.27.0.107
 
+  feefeed:
+    image: "omisego/feefeed:latest"
+    command: "start"
+    container_name: feefeed
+    environment:
+      - GITHUB_TOKEN=""
+      - GITHUB_ORGANISATION=omgnetwork
+      - GITHUB_REPO=fee-rules-public
+      - GITHUB_BRANCH=master
+      - RULES_FETCH_INTERVAL=20
+      - RATES_FETCH_INTERVAL=20
+      - GITHUB_FILENAME=fee_rules
+      - DATABASE_URL=postgresql://feefeed:feefeed@172.27.0.107:5432/feefeed
+      - SECRET_KEY_BASE="Y8naENMR8b+vbPHILjwNtEfWFrnbGi2k+UYWm75VnKHfsavmyGLtTmmeJxAGK+zJ"
+      - DATADOG_DISABLED=true
+      - DATADOG_HOST="localhost"
+      - ETHEREUM_NODE_URL=http://172.27.0.108:80
+    ports:
+      - "4000:4000"
+    expose:
+      - "4000"
+    depends_on:
+      - postgres
+    restart: always
+    networks:
+      chain_net:
+        ipv4_address: 172.27.0.110
+
+  childchain:
+    image: omisego/childchain-v2:latest
+    command: "full_local"
+    container_name: childchain
+    env_file:
+      - ./localchain_contract_addresses.env
+    environment:
+      DATABASE_URL: postgresql://engine_repo:engine_repo@172.27.0.107:5432/engine_repo
+      ETHEREUM_RPC_URL: http://172.27.0.108:80
+      LOGGER_BACKEND: console
+      ETHEREUM_EVENTS_CHECK_INTERVAL_MS: 800
+      FEE_FEED_URL: http://172.27.0.110:4000/api/v1/fees
+      FEE_CHANGE_TOLERANCE_PERCENT: 20
+      FEE_ADAPTER: FEED
+      STORED_FEE_UPDATE_INTERVAL_MINUTES: 2
+      FEE_CLAIMER_ADDRESS: "0x0000000000000000000000000000000000000000"
+    depends_on:
+      - feefeed
+      - nginx
+      - geth
+    restart: always
+    networks:
+      chain_net:
+        ipv4_address: 172.27.0.103
+
   geth:
-    image: ethereum/client-go:v1.9.12
+    image: ethereum/client-go:v1.9.15
     entrypoint: /bin/sh -c ". data/command"
     environment:
       RPC_PORT: 8545
@@ -62,7 +112,7 @@ services:
         ipv4_address: 172.27.0.102
 
   childchain:
-    image: omisego/child_chain:latest
+    image: omisego/childchain-v2:latest
     command: "full_local"
     container_name: childchain
     env_file:
@@ -102,7 +152,7 @@ services:
         ipv4_address: 172.27.0.103
 
   watcher:
-    image: omisego/watcher:latest
+    image: omisego/watcher-v2:latest
     command: "full_local"
     container_name: watcher
     env_file:
@@ -145,7 +195,7 @@ services:
         ipv4_address: 172.27.0.104
 
   watcher_info:
-    image: omisego/watcher_info:latest
+    image: omisego/watcher_info-v2:latest
     command: "full_local"
     container_name: watcher_info
     env_file: