Browse Source

query-node: update start/kill scripts

Mokhtar Naamani 3 years ago
parent
commit
2e77114b5d
6 changed files with 5 additions and 60 deletions
  1. 0 13
      query-node/bootstrap.sh
  2. 0 17
      query-node/kill-img.sh
  3. 2 2
      query-node/kill.sh
  4. 1 3
      query-node/package.json
  5. 0 23
      query-node/start-img.sh
  6. 2 2
      query-node/start.sh

+ 0 - 13
query-node/bootstrap.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-SCRIPT_PATH="$(dirname "${BASH_SOURCE[0]}")"
-cd $SCRIPT_PATH
-
-# Load and export variables from root .env file into shell environment
-set -a
-. ../.env
-. ./generated/graphql-server/.env
-set +a
-
-BOOTSTRAP_DATA_FOLDER=`pwd`/mappings/bootstrap/data node ./mappings/lib/mappings/bootstrap/index.js

+ 0 - 17
query-node/kill-img.sh

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-SCRIPT_PATH="$(dirname "${BASH_SOURCE[0]}")"
-cd $SCRIPT_PATH
-
-set -a
-. ../.env
-set +a
-
-# Only remove query-node related services
-docker-compose rm -vsf processor
-docker-compose rm -vsf graphql-server
-docker-compose rm -vsf indexer
-docker-compose rm -vsf hydra-indexer-gateway
-docker-compose rm -vsf redis
-docker-compose rm -vsf db

+ 2 - 2
query-node/kill.sh

@@ -9,8 +9,8 @@ set -a
 set +a
 
 # Only remove query-node related services
-docker-compose rm -vsf processor-mnt
-docker-compose rm -vsf graphql-server-mnt
+docker-compose rm -vsf processor
+docker-compose rm -vsf graphql-server
 docker-compose rm -vsf indexer
 docker-compose rm -vsf hydra-indexer-gateway
 docker-compose rm -vsf redis

+ 1 - 3
query-node/package.json

@@ -31,9 +31,7 @@
     "typegen": "rm -rf ./mappings/generated && yarn hydra-typegen typegen manifest.yml --debug",
     "mappings:build": "yarn workspace query-node-mappings build",
     "start:dev": "./start.sh",
-    "start": "./start-img.sh",
-    "kill:dev": "./kill.sh",
-    "kill": "./kill-img.sh"
+    "kill:dev": "./kill.sh"
   },
   "author": "",
   "license": "ISC",

+ 0 - 23
query-node/start-img.sh

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-SCRIPT_PATH="$(dirname "${BASH_SOURCE[0]}")"
-cd $SCRIPT_PATH
-
-set -a
-. ../.env
-set +a
-
-# Start the joystream-node first to allow fetching Olympia metadata during build (typegen)
-docker-compose up -d joystream-node
-
-# Bring up db
-docker-compose up -d db
-
-# Setup the db
-docker run --rm --env-file ../.env --network joystream_default joystream/apps workspace query-node-root db:prepare
-docker run --rm --env-file ../.env --network joystream_default joystream/apps workspace query-node-root db:migrate
-
-# Start processor and graphql server
-docker-compose up -d processor
-docker-compose up -d graphql-server

+ 2 - 2
query-node/start.sh

@@ -31,6 +31,6 @@ yarn workspace query-node-root db:migrate
 export DB_HOST=db
 
 # Start processor and graphql server
-docker-compose up -d processor-mnt
-docker-compose up -d graphql-server-mnt
+docker-compose up -d processor
+docker-compose up -d graphql-server