Mieubrisse/fix dockerfiles

.gitpod.yml

@@ -1,5 +1,6 @@
 image: gitpod/workspace-postgres
 tasks:
+  # NOTE: As of 2021-1012, the contract helper DB seems to use the indexer DB so this likely won't work anymore
   - init: yarn && ./scripts/create_dev_dbs.sh
 github:
   prebuilds:

Dockerfile.app

@@ -1,11 +1,8 @@
-FROM nearprotocol/bridge as bridge
+# TODO pin Node version so the image isn't constantly updating under us?
 FROM node:12
 WORKDIR /usr/app
 COPY ./package.json .
 COPY ./yarn.lock .
 RUN yarn
 COPY . .
-RUN grep -v ACCOUNT_CREATOR_KEY .env.sample | grep -v NODE_URL | grep -v INDEXER_DB_CONNECTION > .env
-COPY --from=bridge /root/.near/localnet/node0/validator_key.json . 
-RUN ACCOUNT_CREATOR_KEY=$(cat validator_key.json | tr -d " \t\n\r") && echo "ACCOUNT_CREATOR_KEY=$ACCOUNT_CREATOR_KEY" >> .env
-CMD ["sh", "-c",  "sleep 10 && yarn migrate && yarn start"]
+CMD ["sh", "-c",  "yarn start-without-env"]

package.json

@@ -4,7 +4,8 @@
   "description": "Micro-service used by NEARStudio to deploy smart contracts.",
   "main": "app.js",
   "scripts": {
-    "start": "env $(sed 's/ # .*//' .env) supervisor app",
+    "start-without-env": "supervisor app",
+    "start": "env $(sed 's/ # .*//' .env) yarn start-without-env",
     "test": "yarn lint && mocha",
     "lint": "eslint .",
     "fix": "eslint . --fix",