Merge branch 'release'

# Conflicts:
#	env.js

.drone.yml

@@ -40,7 +40,14 @@ trigger:
   branch: release
 steps:
   - name: build-dist
-    image: node:10.8
+    image: node:10.16
+    environment:
+      GH_TOKEN:
+        from_secret: gh_token
+      SENTRY_DSN:
+        from_secret: sentry_dsn
+      GA_TRACKING_ID:
+        from_secret: ga_tracking_id
     commands:
       - npm install
       - npm run build:dist
@@ -50,16 +57,24 @@ steps:
     environment:
       GH_TOKEN:
         from_secret: gh_token
+      SENTRY_DSN:
+        from_secret: sentry_dsn
+      GA_TRACKING_ID:
+        from_secret: ga_tracking_id
     commands:
       - npm run build:target -- --win -p always
     depends_on:
       - build-dist
 
   - name: build-target-linux
-    image: node:10.8
+    image: node:10.16
     environment:
       GH_TOKEN:
         from_secret: gh_token
+      SENTRY_DSN:
+        from_secret: sentry_dsn
+      GA_TRACKING_ID:
+        from_secret: ga_tracking_id
     commands:
       - npm run build:target -- --linux -p always
     depends_on:

.env.example

@@ -1,3 +1,2 @@
 SENTRY_DSN=https://[email protected]/1468974
-WEB_DEMO_MODE=false
 GA_TRACKING_ID=

.gitignore

@@ -9,6 +9,7 @@ thumbs.db
 !.gitkeep
 sentry.properties
 .env
+.env.production
 __diff_output__
 cypress/screenshots
 cypress/videos

README.md

@@ -15,6 +15,8 @@
   </a>
 </p>
 
+[Official Site](https://kube-forwarder.pixelpoint.io)
+
 Easy to use Kubernetes port forwarding management. 
 Built with [Electron](https://electronjs.org)
 
@@ -56,6 +58,10 @@ git clone https://github.com/<your-username>/kube-forwarder
 # install dependencies
 npm install
 
+# prepare .env files
+cp .env.example .env
+cp .env.example .env.production
+
 # serve with hot reload in Electron Dev app
 npm run dev
 
@@ -109,12 +115,13 @@ npm run test:cypress:open
 
 ## Release guide
 
-1) Update the version in `package.json`.
-2) Push to `release` branch. [Drone(pixel-point/kube-forwarder)](https://drone.pixelpoint.io/pixel-point/kube-forwarder/)
+1) Be sure that you created `.env.production` and filled it in the right way.
+2) Update the version in `package.json`.
+3) Push to `release` branch. [Drone(pixel-point/kube-forwarder)](https://drone.pixelpoint.io/pixel-point/kube-forwarder/)
 will build packages for Windows and Linux and upload them to [releases](https://github.com/pixel-point/kube-forwarder/releases)
-3) Run `npm run release` on a Mac computer to build `.dmg` target. 
+4) Run `npm run release` on a Mac computer to build `.dmg` target. 
 It will be automatically pushed to releases at Github.
-4) Go to [Releases](https://github.com/pixel-point/kube-forwarder/releases) in the repository. 
+5) Go to [Releases](https://github.com/pixel-point/kube-forwarder/releases) in the repository. 
 Make sure that the created draft is OK and release it (Edit -> Release). 
 
 Notes: 
@@ -123,7 +130,7 @@ Notes:
 2) A release tag (for example: `v1.0.3`) will be added automatically 
 by Github when you release your draft.
 
-## Tips
+## Development Tips
 
 Use `tiffutil -cathidpicheck bg.png [email protected] -out bg.tiff` to build a tiff
 background for .DMG 

env.js

@@ -1,4 +1,2 @@
 const dotEnv = require('dotenv-safe')
-if (!process.env.CI) dotEnv.load({
-    allowEmptyValues: true
-})
+dotEnv.load({ path: '.env.production', allowEmptyValues: true })