Merge pull request #1441 from keep-network/dapp-ropsten-deployment

Dapp ropsten deployment

Author: nkuba

.circleci/config.yml

@@ -172,7 +172,7 @@ jobs:
             cd /tmp/keep-client/contracts
             gsutil -m cp * gs://${CONTRACT_DATA_BUCKET}/keep-core
 
-  build_staking_dapp:
+  build_token_dashboard_dapp:
     executor: docker-node
     steps:
       - attach_workspace:
@@ -189,30 +189,30 @@ jobs:
           name: Run Docker build
           working_directory: ~/project/contracts/solidity/dashboard
           command: |
-            docker build --tag keep-staking-dapp .
+            docker build --tag keep-dapp-token-dashboard .
       - run:
-          name: Save keep-staking-dapp image
+          name: Save keep-dapp-token-dashboard image
           working_directory: ~/project/contracts/solidity/dashboard
           command: |
-            mkdir -p /tmp/keep-staking-dapp/docker-images/
-            docker save -o /tmp/keep-staking-dapp/docker-images/keep-staking-dapp.tar keep-staking-dapp
+            mkdir -p /tmp/keep-dapp-token-dashboard/docker-images/
+            docker save -o /tmp/keep-dapp-token-dashboard/docker-images/keep-dapp-token-dashboard.tar keep-dapp-token-dashboard
       - persist_to_workspace:
-          root: /tmp/keep-staking-dapp
+          root: /tmp/keep-dapp-token-dashboard
           paths:
             - docker-images
-  publish_staking_dapp:
+  publish_token_dashboard_dapp:
     executor: gcp-gcr/default
     steps:
       - attach_workspace:
-          at: /tmp/keep-staking-dapp
+          at: /tmp/keep-dapp-token-dashboard
       - run:
-          name: Load keep-staking-dapp image
+          name: Load keep-dapp-token-dashboard image
           command: |
-            docker load -i /tmp/keep-staking-dapp/docker-images/keep-staking-dapp.tar
+            docker load -i /tmp/keep-dapp-token-dashboard/docker-images/keep-dapp-token-dashboard.tar
       - run:
           name: Tag Docker image
           command: |
-            docker tag keep-staking-dapp $GCR_REGISTRY_URL/$GOOGLE_PROJECT_ID/keep-staking-dapp
+            docker tag keep-dapp-token-dashboard $GCR_REGISTRY_URL/$GOOGLE_PROJECT_ID/keep-dapp-token-dashboard
       - gcp-gcr/gcr-auth:
           google-project-id: GOOGLE_PROJECT_ID
           google-compute-zone: GOOGLE_COMPUTE_ZONE_A
@@ -221,7 +221,7 @@ jobs:
       - gcp-gcr/push-image:
           google-project-id: GOOGLE_PROJECT_ID
           registry-url: $GCR_REGISTRY_URL
-          image: keep-staking-dapp
+          image: keep-dapp-token-dashboard
           tag: latest
 
   generate_docs_tex:
@@ -322,16 +322,16 @@ workflows:
           requires:
             - build_client_and_test_go
             - migrate_contracts
-      - build_staking_dapp:
+      - build_token_dashboard_dapp:
           requires:
             - migrate_contracts
-      - publish_staking_dapp:
+      - publish_token_dashboard_dapp:
           filters:
             branches:
               only: master
           context: keep-dev
           requires:
-            - build_staking_dapp
+            - build_token_dashboard_dapp
   build-test-migrate-publish-keep-test:
       jobs:
         - keep_test_approval:
@@ -390,23 +390,23 @@ workflows:
             requires:
               - build_client_and_test_go
               - migrate_contracts
-        - build_staking_dapp:
+        - build_token_dashboard_dapp:
             filters:
               tags:
                 only: /^v.*/
               branches:
                 ignore: /.*/
             requires:
               - migrate_contracts
-        - publish_staking_dapp:
+        - publish_token_dashboard_dapp:
             context: keep-test
             filters:
               tags:
                 only: /^v.*/
               branches:
                 ignore: /.*/
             requires:
-              - build_staking_dapp
+              - build_token_dashboard_dapp
   docs:
     jobs:
       - generate_docs_tex

contracts/solidity/dashboard/.env.development

@@ -12,14 +12,13 @@ RUN apk add --update --no-cache \
 
 COPY package.json /app/package.json
 COPY package-lock.json /app/package-lock.json
-COPY .env* /app/
 
 RUN npm install
 
 COPY src /app/src
 COPY public /app/public
 
-RUN npm run build:keep-dev
+RUN npm run build
 
 # Production environment
 FROM nginx:1.17-alpine

contracts/solidity/dashboard/.env.keep-dev

@@ -22,8 +22,7 @@
     "start-js": "react-scripts start",
     "setup": "./scripts/copy-contracts.sh ../build/contracts",
     "start": "npm run setup && npm run watch-css & npm run start-js",
-    "build": "npm run build-css && sh -ac '. .env.${REACT_APP_ENV}; react-scripts build'",
-    "build:keep-dev": "REACT_APP_ENV=keep-dev npm run build",
+    "build": "npm run build-css && react-scripts build",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject",
     "js:lint": "eslint src/**/*.js src/**/*.jsx",