Fix running services

brett1127 · Jan 11, 2021 · 9f6edfa · 9f6edfa
1 parent 8c527cd
commit 9f6edfa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,8 +26,6 @@ jobs:
             docker-compose -f docker-compose-runner.yml exec -T zk zk init
       - name: lints
         run: docker-compose -f docker-compose-runner.yml exec -T zk sh infrastructure/ci-scripts/lints.sh
-      - name: cache
-        run: docker-compose -f docker-compose-runner.yml exec -T zk sh infrastructure/ci-scripts/cache.sh
 
       - name: generic-init
         run: |
@@ -60,3 +58,6 @@ jobs:
 
       - name: zksync-crypto-tests
         run: docker-compose -f docker-compose-runner.yml exec -T zk pushd sdk/zksync-crypto && zk f cargo test --release
+
+      - name: cache
+        run: docker-compose -f docker-compose-runner.yml exec -T zk sh infrastructure/ci-scripts/cache.sh
diff --git a/docker-compose-runner.yml b/docker-compose-runner.yml
@@ -17,6 +17,12 @@ services:
     image: "matterlabs/dev-ticker:latest"
     ports:
       - "9876:9876"
+  dev-liquidity-token-watcher:
+    image: "matterlabs/dev-liquidity-token-watcher:latest"
+    ports:
+      - "9975:9975"
+    volumes:
+      - ./etc/tokens/:/etc/tokens
 
   tesseracts:
     image: "adria0/tesseracts"
@@ -30,6 +36,8 @@ services:
     depends_on:
       - postgres
       - geth
+      - dev-ticker
+      -
     command: tail -f /dev/null
     volumes:
       - .:/usr/src/zksync

diff --git a/etc/env/docker.env b/etc/env/docker.env
@@ -2,3 +2,5 @@ WEB3_URL=http://geth:8545
 COINMARKETCAP_BASE_URL=http://dev-ticker:9876
 COINGECKO_BASE_URL=http://dev-ticker:9876
 DATABASE_URL=postgres://postgres@postgres/plasma
+TICKER_UNISWAP_URL=http://dev-liquidity-token-watcher:9975/graphql
+
diff --git a/infrastructure/ci-scripts/run_services.sh b/infrastructure/ci-scripts/run_services.sh
@@ -1,13 +1,3 @@
-# Launch binaries
-echo "Launching dev-ticker-server..."
-nohup zk f $ZKSYNC_HOME/target/release/dev-ticker-server &>/dev/null &
-sleep 1
-
-# Launch binaries
-echo "Launching dev-liquidity-token-watcher..."
-nohup zk f $ZKSYNC_HOME/target/release/dev-liquidity-token-watcher &>/dev/null &
-sleep 1
-
 echo "Launching server..."
 nohup zk f $ZKSYNC_HOME/target/release/zksync_server &>$ZKSYNC_HOME/server.log &
 sleep 1