Browse Source

query-node: point processor at correct database and do typeorm migrations for both DBs

Mokhtar Naamani 4 years ago
parent
commit
04df68c182
4 changed files with 6 additions and 3 deletions
  1. 1 1
      docker-compose.yml
  2. 2 2
      query-node/build.sh
  3. 1 0
      query-node/run-tests.sh
  4. 2 0
      start.sh

+ 1 - 1
docker-compose.yml

@@ -88,8 +88,8 @@ services:
       - .env
     environment:
       - INDEXER_ENDPOINT_URL=http://indexer-api-gateway:4000/graphql
-      - DB_HOST=db
       - TYPEORM_HOST=db
+      - TYPEORM_DATABASE=${PROCESSOR_DB_NAME}
       - DEBUG=index-builder:*
       - WS_PROVIDER_ENDPOINT_URI=ws://joystream-node:9944
     depends_on:

+ 2 - 2
query-node/build.sh

@@ -14,10 +14,10 @@ yarn clean
 # We generate the code for each service separately to be able to specify
 # separate database names.
 
-# Build indexer customizing DB name and port
+# Build indexer customizing DB name
 DB_NAME=${INDEXER_DB_NAME} yarn codegen:indexer
 
-# Build graphql-server customizing DB name and port
+# Build graphql-server customizing DB name
 DB_NAME=${PROCESSOR_DB_NAME} yarn codegen:server
 
 # We run yarn again to ensure processor and indexer dependencies are installed

+ 1 - 0
query-node/run-tests.sh

@@ -36,6 +36,7 @@ docker-compose up -d db
 # Migrate the databases
 yarn workspace query-node-root db:indexer:migrate
 yarn workspace query-node-root db:schema:migrate
+TYPEORM_DATABASE=query_node_processor yarn workspace query-node-root db:indexer:migrate
 
 docker-compose up -d graphql-server
 

+ 2 - 0
start.sh

@@ -30,6 +30,8 @@ yarn workspace @joystream/cd-schemas initialize:dev
 # Initialize a new database for the query node infrastructure
 docker-compose up -d db
 yarn workspace query-node-root db:migrate
+TYPEORM_DATABASE=query_node_processor yarn workspace query-node-root db:indexer:migrate
+
 # Startup all query-node infrastructure services
 docker-compose up -d graphql-server
 docker-compose up -d processor