Browse Source

Add skip_node to start, revert query package.json

Anuj Bansal 3 years ago
parent
commit
4916371e6f
3 changed files with 11 additions and 8 deletions
  1. 1 0
      devops/aws/roles/rpc/tasks/main.yml
  2. 5 6
      query-node/package.json
  3. 5 2
      start.sh

+ 1 - 0
devops/aws/roles/rpc/tasks/main.yml

@@ -48,6 +48,7 @@
     JOYSTREAM_NODE_WS: 'ws://{{ inventory_hostname }}:9944/'
     JOYSTREAM_NODE_WS: 'ws://{{ inventory_hostname }}:9944/'
     COLOSSUS_1_URL: 'https://{{ inventory_hostname }}.nip.io/colossus-1/'
     COLOSSUS_1_URL: 'https://{{ inventory_hostname }}.nip.io/colossus-1/'
     DISTRIBUTOR_1_URL: 'https://{{ inventory_hostname }}.nip.io/distributor-1/'
     DISTRIBUTOR_1_URL: 'https://{{ inventory_hostname }}.nip.io/distributor-1/'
+    SKIP_NODE: 'true'
   args:
   args:
     chdir: '{{ remote_code_path }}'
     chdir: '{{ remote_code_path }}'
   async: 1800
   async: 1800

+ 5 - 6
query-node/package.json

@@ -4,6 +4,8 @@
   "description": "GraphQL server and mappings. Generated with \u2665 by Hydra-CLI",
   "description": "GraphQL server and mappings. Generated with \u2665 by Hydra-CLI",
   "scripts": {
   "scripts": {
     "build": "./build.sh",
     "build": "./build.sh",
+    "start": "./start.sh",
+    "kill": "./kill.sh",
     "rebuild": "yarn db:drop && yarn clean:query-node && yarn codegen:query-node && yarn db:prepare && yarn db:migrate",
     "rebuild": "yarn db:drop && yarn clean:query-node && yarn codegen:query-node && yarn db:prepare && yarn db:migrate",
     "lint": "yarn workspace query-node-mappings lint",
     "lint": "yarn workspace query-node-mappings lint",
     "clean": "rm -rf ./generated",
     "clean": "rm -rf ./generated",
@@ -21,17 +23,14 @@
     "db:processor:migrate": "hydra-processor migrate --env ../.env",
     "db:processor:migrate": "hydra-processor migrate --env ../.env",
     "db:migrate": "yarn db:schema:migrate && yarn db:processor:migrate",
     "db:migrate": "yarn db:schema:migrate && yarn db:processor:migrate",
     "db:bootstrap": "yarn db:create && yarn db:prepare && yarn db:migrate",
     "db:bootstrap": "yarn db:create && yarn db:prepare && yarn db:migrate",
-    "db:reset": "yarn db:drop && yarn db:prepare && yarn db:migrate",
     "bootstrap": "yarn codegen && yarn db:drop && yarn db:bootstrap",
     "bootstrap": "yarn codegen && yarn db:drop && yarn db:bootstrap",
-    "hydra-cli": "./codegen/node_modules/@joystream/hydra-cli/bin/run",
-    "hydra-typegen": "./codegen/node_modules/@joystream/hydra-typegen/bin/run",
+    "hydra-cli": "./codegen/node_modules/.bin/hydra-cli",
+    "hydra-typegen": "./codegen/node_modules/.bin/hydra-typegen",
     "codegen": "yarn hydra-cli codegen --schema ../../schemas/",
     "codegen": "yarn hydra-cli codegen --schema ../../schemas/",
     "codegen:noinstall": "yarn codegen --no-install",
     "codegen:noinstall": "yarn codegen --no-install",
-    "typegen:configure": "NODE_URL=${NODE_URL:-ws://localhost:9000} envsub typegen.template.yml typegen.yml",
     "typegen": "rm -rf ./mappings/generated && yarn hydra-typegen typegen manifest.yml --debug",
     "typegen": "rm -rf ./mappings/generated && yarn hydra-typegen typegen manifest.yml --debug",
     "mappings:build": "yarn workspace query-node-mappings build",
     "mappings:build": "yarn workspace query-node-mappings build",
-    "start:dev": "./start.sh",
-    "kill:dev": "./kill.sh"
+    "format": "prettier ./ --write"
   },
   },
   "author": "",
   "author": "",
   "license": "ISC",
   "license": "ISC",

+ 5 - 2
start.sh

@@ -22,8 +22,11 @@ else
   trap down EXIT
   trap down EXIT
 fi
 fi
 
 
-## Run a local development chain
-docker-compose up -d joystream-node
+if [ "${SKIP_NODE}" != true ]
+then
+  ## Run a local development chain
+  docker-compose up -d joystream-node
+fi
 
 
 ## Init the chain with some state
 ## Init the chain with some state
 if [[ $SKIP_CHAIN_SETUP != 'true' ]]; then
 if [[ $SKIP_CHAIN_SETUP != 'true' ]]; then