Bläddra i källkod

Remove dev init from docker compose for colossus

Anuj Bansal 3 år sedan
förälder
incheckning
608ddc78ff
3 ändrade filer med 12 tillägg och 17 borttagningar
  1. 8 5
      .env
  2. 0 11
      docker-compose.yml
  3. 4 1
      start.sh

+ 8 - 5
.env

@@ -22,11 +22,6 @@ TYPEORM_LOGGING=error
 # Note, that if there are already some indexed events, this setting is ignored
 BLOCK_HEIGHT=0
 
-######################
-#    Storage Node    #
-######################
-COLOSSUS_PORT=3333
-
 ###############################
 #    Processor GraphQL API    #
 ###############################
@@ -42,3 +37,11 @@ WS_PROVIDER_ENDPOINT_URI=ws://joystream-node:9944/
 
 # If running joystream-node on host machine you can use following address to reach it instead
 # WS_PROVIDER_ENDPOINT_URI=ws://host.docker.internal:9944/
+
+######################
+#    Storage Node    #
+######################
+COLOSSUS_PORT=3333
+QUERY_NODE_HOST=${GRAPHQL_SERVER_HOST}:${GRAPHQL_SERVER_PORT}
+WORKER_ID=0
+ACCOUNT_URI=//Alice

+ 0 - 11
docker-compose.yml

@@ -31,20 +31,9 @@ services:
       - /keystore
     ports:
       - '127.0.0.1:3333:${COLOSSUS_PORT}'
-    entrypoint: ['/bin/sh', '-c']
-    command:
-      - |
-        yarn storage-node dev:init --apiUrl ${WS_PROVIDER_ENDPOINT_URI}
-        yarn storage-node server --queryNodeHost $${QUERY_NODE_HOST} --port ${COLOSSUS_PORT} \
-          --uploads /data --worker $${WORKER_ID} --apiUrl ${WS_PROVIDER_ENDPOINT_URI} --sync --syncInterval=1 \
-          --keyFile=${ACCOUNT_KEYFILE} --elasticSearchHost=${ELASTIC_SEARCH_HOST}
     env_file:
       # relative to working directory where docker-compose was run from
       - .env
-    environment:
-      - QUERY_NODE_HOST=${GRAPHQL_SERVER_HOST}:${GRAPHQL_SERVER_PORT}
-      - WORKER_ID=0
-      - ACCOUNT_URI=//Alice
 
   distributor-node:
     image: joystream/distributor-node

+ 4 - 1
start.sh

@@ -45,7 +45,10 @@ docker-compose up -d processor
 docker-compose up -d graphql-server
 
 ## Storage Infrastructure
-docker-compose up -d colossus
+docker-compose run -d --name colossus colossus "yarn storage-node dev:init --apiUrl ${WS_PROVIDER_ENDPOINT_URI} && \
+          yarn storage-node server --queryNodeHost ${QUERY_NODE_HOST} --port ${COLOSSUS_PORT} \
+          --uploads /data --worker ${WORKER_ID} --apiUrl ${WS_PROVIDER_ENDPOINT_URI} --sync --syncInterval=1 \
+          --keyFile=${ACCOUNT_KEYFILE} --elasticSearchHost=${ELASTIC_SEARCH_HOST}"
 
 docker-compose up -d distributor-node