Added scripts for easy run and build

2024-12-23 23:48:07 +00:00 · 2018-10-02 15:43:03 +02:00 · 2018-10-02 15:43:03 +02:00 · 7b6071fe79
commit 7b6071fe79
parent fcd55b767b
7 changed files with 46 additions and 95 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,3 +1 @@
-.git
-node_modules
-build
+node_modules
--- a/README.md
+++ b/README.md
@ -1,12 +1,12 @@
 # Trezor Ethereum wallet

 To install dependencies run `npm install` or `yarn`
-
 To start locally run `npm run dev` or `yarn run dev`
-
 To build the project run `npm run build` or `yarn run build`

-======================================
+## Docker
+- Build docker image `docker build -t trezor-wallet .`
+- Run image

 ## Project structure
 The project is divided into two parts - data that are used when compiling the project and data that aren't.
--- a/build.sh
+++ b/build.sh
@ -1,15 +0,0 @@
-
-
-printf "\n-- DEPLOY START -----------------------\n"
-
-yarn run build
-
-printf "\n-- COPYING FILES ----------------------\n"
-
-# cd build
-# rsync -avz --delete -e ssh ./build/* admin@dev.sldev.cz:~/experiments/www
-rsync -avz --delete -e ssh ./build/* admin@dev.sldev.cz:~/mytrezor/www/ethereum
-# rsync -avz --delete -e ssh ./build/* admin@dev.sldev.cz:~/experiments/www
-cd ../
-
-printf "\n-- COMPLETE ---------------------------\n"
--- a/package.json
+++ b/package.json
@ -11,7 +11,7 @@
        "dev": "npx webpack-dev-server --config ./webpack/dev.babel.js",
        "dev:local": "npx webpack-dev-server --config ./webpack/local.babel.js",
        "build:prod": "rimraf build && npx webpack --config ./webpack/production.babel.js --progress --bail",
-        "build:dev": "rimraf build-devel && cross-env BUILD=development npx webpack --config ./webpack/production.babel.js --output-path build-devel --progress --bail",
+        "build:dev": "rimraf build-devel && cross-env BUILD=development npx webpack --config webpack/production.babel.js --output-path build-devel --progress --bail",
        "build": "run-s build:*",
        "flow": "flow check src",
        "lint": "run-s lint:*",
@ -20,8 +20,7 @@
        "test": "run-s test:*",
        "test:unit": "npx jest",
        "test-unit:watch": "npx jest -o --watch",
-        "prod-server": "npx http-server ./build -a localhost -S -C ./server/cert.pem -K ./server/key.pem -o",
-        "prod-server-dev": "npx http-server ./build-devel -a localhost -S -C ./server/cert.pem -K ./server/key.pem -o"
+        "prod-server": "node ./server/index.js"
    },
    "dependencies": {
        "babel": "^6.23.0",
@ -34,12 +33,13 @@
        "ethereumjs-tx": "^1.3.3",
        "ethereumjs-units": "^0.2.0",
        "ethereumjs-util": "^5.1.4",
+        "express": "^4.16.3",
        "flow-webpack-plugin": "^1.2.0",
        "git-revision-webpack-plugin": "^3.0.3",
        "hdkey": "^0.8.0",
        "html-webpack-plugin": "^3.2.0",
-        "http-server": "^0.11.1",
        "jest-fetch-mock": "^1.6.5",
+        "morgan": "^1.9.1",
        "npm-run-all": "^4.1.3",
        "prop-types": "^15.6.2",
        "raf": "^3.4.0",
@ -107,5 +107,8 @@
        "webpack-cli": "^2.1.3",
        "webpack-dev-server": "^3.1.4",
        "yargs": "11.0.0"
+    },
+    "optionalDependencies": {
+        "fsevents": "*"
    }
 }
--- a/scripts/docker-build.sh
+++ b/scripts/docker-build.sh
@ -0,0 +1,3 @@
+#!/bin/bash
+set -e
+docker build -t trezor-wallet ../
--- a/scripts/docker-run.sh
+++ b/scripts/docker-run.sh
@ -0,0 +1,2 @@
+#!/bin/bash
+docker run -p 8080:8080 -d trezor-wallet:latest
--- a/yarn.lock
+++ b/yarn.lock
@ -1710,6 +1710,12 @@ base@^0.11.1:
    mixin-deep "^1.2.0"
    pascalcase "^0.1.1"

+basic-auth@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+  dependencies:
+    safe-buffer "5.1.2"
+
 batch@0.6.1:
  version "0.6.1"
  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
@ -2736,10 +2742,6 @@ cors@^2.8.1:
    object-assign "^4"
    vary "^1"

-corser@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/corser/-/corser-2.0.1.tgz#8eda252ecaab5840dcd975ceb90d9370c819ff87"
-
 cosmiconfig@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-3.1.0.tgz#640a94bf9847f321800403cd273af60665c73397"
@ -3410,15 +3412,6 @@ ecc-jsbn@~0.1.1:
  dependencies:
    jsbn "~0.1.0"

-ecstatic@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.3.0.tgz#91cd417d152abf85b37b1ab3ebf3bd25cdc64e80"
-  dependencies:
-    he "^1.1.1"
-    mime "^1.6.0"
-    minimist "^1.1.0"
-    url-join "^2.0.5"
-
 editions@^1.3.3:
  version "1.3.4"
  resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
@ -4016,9 +4009,9 @@ expect@^23.4.0:
    jest-message-util "^23.4.0"
    jest-regex-util "^23.3.0"

-express@^4.14.0, express@^4.16.2:
+express@^4.14.0, express@^4.16.2, express@^4.16.3:
  version "4.16.3"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
+  resolved "http://registry.npmjs.org/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
  dependencies:
    accepts "~1.3.5"
    array-flatten "1.1.1"
@ -4459,6 +4452,13 @@ fs.realpath@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"

+fsevents@*, fsevents@^1.1.2, fsevents@^1.2.2, fsevents@^1.2.3:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
+  dependencies:
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
+
 fsevents@^1.0.0:
  version "1.1.3"
  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
@ -4466,13 +4466,6 @@ fsevents@^1.0.0:
    nan "^2.3.0"
    node-pre-gyp "^0.6.39"

-fsevents@^1.1.2, fsevents@^1.2.2, fsevents@^1.2.3:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
-  dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
-
 fstream-ignore@^1.0.5:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
@ -4915,7 +4908,7 @@ hdkey@^0.8.0:
    safe-buffer "^5.1.1"
    secp256k1 "^3.0.1"

-he@1.1.x, he@^1.1.1:
+he@1.1.x:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"

@ -5080,7 +5073,7 @@ http-proxy-middleware@~0.18.0:
    lodash "^4.17.5"
    micromatch "^3.1.9"

-http-proxy@^1.16.2, http-proxy@^1.8.1:
+http-proxy@^1.16.2:
  version "1.17.0"
  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
  dependencies:
@ -5088,19 +5081,6 @@ http-proxy@^1.16.2, http-proxy@^1.8.1:
    follow-redirects "^1.0.0"
    requires-port "^1.0.0"

-http-server@^0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.11.1.tgz#2302a56a6ffef7f9abea0147d838a5e9b6b6a79b"
-  dependencies:
-    colors "1.0.3"
-    corser "~2.0.0"
-    ecstatic "^3.0.0"
-    http-proxy "^1.8.1"
-    opener "~1.4.0"
-    optimist "0.6.x"
-    portfinder "^1.0.13"
-    union "~0.4.3"
-
 http-signature@~1.1.0:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
@ -6779,10 +6759,6 @@ mime@1.4.1:
  version "1.4.1"
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"

-mime@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-
 mime@^2.1.0:
  version "2.3.1"
  resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
@ -6834,7 +6810,7 @@ minimist@^0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"

-minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
+minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"

@ -6893,6 +6869,16 @@ mock-fs@^4.1.0:
  version "4.6.0"
  resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.6.0.tgz#d944ef4c3e03ceb4e8332b4b31b8ac254051c8ae"

+morgan@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59"
+  dependencies:
+    basic-auth "~2.0.0"
+    debug "2.6.9"
+    depd "~1.1.2"
+    on-finished "~2.3.0"
+    on-headers "~1.0.1"
+
 mout@^0.11.0:
  version "0.11.1"
  resolved "https://registry.yarnpkg.com/mout/-/mout-0.11.1.tgz#ba3611df5f0e5b1ffbfd01166b8f02d1f5fa2b99"
@ -7335,17 +7321,13 @@ opener@^1.4.3:
  version "1.5.1"
  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"

-opener@~1.4.0:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
-
 opn@^5.1.0:
  version "5.3.0"
  resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
  dependencies:
    is-wsl "^1.1.0"

-optimist@0.6.x, optimist@^0.6.1:
+optimist@^0.6.1:
  version "0.6.1"
  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
  dependencies:
@ -7705,14 +7687,6 @@ pn@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"

-portfinder@^1.0.13:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
-  dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
-
 portfinder@^1.0.9:
  version "1.0.13"
  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
@ -8221,10 +8195,6 @@ qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
  version "6.5.2"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"

-qs@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-2.3.3.tgz#e9e85adbe75da0bbe4c8e0476a086290f863b404"
-
 qs@~6.4.0:
  version "6.4.0"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
@ -9125,7 +9095,7 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
  version "5.1.1"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"

-safe-buffer@^5.1.2:
+safe-buffer@5.1.2, safe-buffer@^5.1.2:
  version "5.1.2"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"

@ -10423,12 +10393,6 @@ union-value@^1.0.0:
    is-extendable "^0.1.1"
    set-value "^0.4.3"

-union@~0.4.3:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/union/-/union-0.4.6.tgz#198fbdaeba254e788b0efcb630bc11f24a2959e0"
-  dependencies:
-    qs "~2.3.3"
-
 uniq@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
@ -10526,10 +10490,6 @@ urix@^0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"

-url-join@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
-
 url-join@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a"