浏览代码

colossus fix docker-compose to use queryNodeEndpoint argument

Mokhtar Naamani 3 年之前
父节点
当前提交
66ed401fcf
共有 3 个文件被更改,包括 4 次插入5 次删除
  1. 1 2
      .env
  2. 1 1
      colossus.Dockerfile
  3. 2 2
      docker-compose.yml

+ 1 - 2
.env

@@ -34,8 +34,7 @@ GRAPHQL_SERVER_HOST=localhost
 JOYSTREAM_NODE_WS=ws://joystream-node:9944/
 
 # Query node which colossus will use
-# TODO: Colossus should take a full Url instead
-COLOSSUS_QUERY_NODE_HOST=graphql-server:${GRAPHQL_SERVER_PORT}
+COLOSSUS_QUERY_NODE_URL=http://graphql-server:${GRAPHQL_SERVER_PORT}/graphql
 
 # Query node which distributor will use
 DISTRIBUTOR_QUERY_NODE_URL=http://graphql-server:${GRAPHQL_SERVER_PORT}/graphql

+ 1 - 1
colossus.Dockerfile

@@ -32,7 +32,7 @@ ENV ACCOUNT_URI=
 EXPOSE ${COLOSSUS_PORT}
 
 WORKDIR /joystream/storage-node-v2
-ENTRYPOINT yarn storage-node server --queryNodeHost ${QUERY_NODE_HOST} \
+ENTRYPOINT yarn storage-node server --queryNodeEndpoint ${QUERY_NODE_ENDPOINT} \
     --port ${COLOSSUS_PORT} --uploads /data  \
     --apiUrl ${WS_PROVIDER_ENDPOINT_URI} --sync --syncInterval=${SYNC_INTERVAL} \
     --elasticSearchHost=${ELASTIC_SEARCH_HOST} \

+ 2 - 2
docker-compose.yml

@@ -41,7 +41,7 @@ services:
     command: [
       'yarn', 'storage-node', 'server', '--worker=${COLOSSUS_1_WORKER_ID}', '--port=3333', '--uploads=/data',
       '--sync', '--syncInterval=1',
-      '--queryNodeHost=${COLOSSUS_QUERY_NODE_HOST}',
+      '--queryNodeEndpoint=${COLOSSUS_QUERY_NODE_URL}',
       '--apiUrl=${JOYSTREAM_NODE_WS}'
     ]
 
@@ -106,7 +106,7 @@ services:
     command: [
       'yarn', 'storage-node', 'server', '--worker=${COLOSSUS_2_WORKER_ID}', '--port=3333', '--uploads=/data',
       '--sync', '--syncInterval=1',
-      '--queryNodeHost=${COLOSSUS_QUERY_NODE_HOST}',
+      '--queryNodeEndpoint=${COLOSSUS_QUERY_NODE_URL}',
       '--apiUrl=${JOYSTREAM_NODE_WS}'
     ]