diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94a353f3..168202be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,11 +48,11 @@ build beta: build production: stage: build script: - - yarn run build:prod + - yarn run build:stable artifacts: expire_in: 1 month paths: - - build/prod + - build/stable # deploy deploy review: diff --git a/Dockerfile b/Dockerfile index d1dd82de..7d2db3a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM node:9.3 -ARG BUILD_TYPE=prod +ARG BUILD_TYPE=stable WORKDIR /trezor-wallet-app diff --git a/package.json b/package.json index 32617cbc..80a26712 100644 --- 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": "rimraf build && run-s build:*", - "build:prod": "rimraf build/prod && npx webpack --config webpack/production.babel.js --output-path build/prod --progress --bail", + "build:stable": "rimraf build/stable && npx webpack --config webpack/production.babel.js --output-path build/stable --progress --bail", "build:beta": "rimraf build/beta && cross-env BUILD=beta npx webpack --config webpack/production.babel.js --output-path build/beta --progress --bail", "build:dev": "rimraf build.dev && cross-env BUILD=development npx webpack --config webpack/production.babel.js --output-path build/dev --progress --bail", "flow": "flow check src", @@ -22,7 +22,7 @@ "test:unit": "npx jest", "test-unit:watch": "npx jest -o --watch", "server:beta": "node ./server/index.js --buildType=beta", - "server:prod": "node ./server/index.js --buildType=prod" + "server:stable": "node ./server/index.js --buildType=stable" }, "dependencies": { "babel": "^6.23.0", diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh index 630b3efc..bea0d4e1 100755 --- a/scripts/docker-build.sh +++ b/scripts/docker-build.sh @@ -2,7 +2,7 @@ cd "$(dirname "$0")" -if [[ "$1" == "dev" || "$1" == 'beta' || "$1" == 'prod' ]] +if [[ "$1" == "dev" || "$1" == "beta" || "$1" == "stable" ]] then mkdir -p ../build rm -rf ../build/$1 @@ -12,6 +12,8 @@ if [[ "$1" == "dev" || "$1" == 'beta' || "$1" == 'prod' ]] docker cp trezor-wallet:/trezor-wallet-app/build/$1 ../build/$1 docker stop trezor-wallet docker rm trezor-wallet + echo "DONE!" + echo "Build directory: "$1 else - echo "invalid parameters... valid parameters are (beta, dev, prod)" + echo "invalid parameters... valid parameters are (dev, beta, stable)" fi \ No newline at end of file