Merge branch 'master' into develop

skycoin · Oct 23, 2021 · adc2cbb · adc2cbb
2 parents f222d9d + fc20ab7
commit adc2cbb
Show file tree

Hide file tree

Showing 13 changed files with 1,265 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -47,6 +47,13 @@ $ docker run --rm -v <YOUR_CONFIG_DIR>:/opt/skywire \
   skycoin/skywire:test skywire-cli config gen -i
 ```
 
+Docker container will create config automatically for you, should you want to run it manually, you can do:
+
+```bash
+$ docker run --rm -v <YOUR_CONFIG_DIR>:/opt/skywire \
+  skycoin/skywire:latest skywire-cli visor gen-config --is-hypervisor
+```
+
 After starting up the visor, the UI will be exposed by default on `localhost:8000`.
 
 ### Add remote hypervisor
@@ -65,6 +72,14 @@ $ docker run --rm -v <YOUR_CONFIG_DIR>:/opt/skywire \
   skycoin/skywire:test skywire-cli config update hypervisor-pks <public-key>
 ```
 
+Or from docker image:
+
+```bash
+$ docker run --rm -v <YOUR_CONFIG_DIR>:/opt/skywire \
+  skycoin/skywire:latest skywire-cli update-config hypervisor-pks <public-key>
+
+```
+
 ## Run `skywire-visor`
 
 `skywire-visor` hosts apps and is an applications gateway to the Skywire network.

diff --git a/docker/images/visor/update.sh b/docker/images/visor/update.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if type apt > /dev/null; then
+        apt-get update && apt-get install -y --no-install-recommends \
+                ca-certificates \
+        && rm -rf /var/lib/apt/lists/* 
+fi
+
+if type apk > /dev/null; then
+
+        apk update 
+        apk upgrade 
+        apk add --no-cache ca-certificates openssl iproute2
+        update-ca-certificates --fresh
+        apk add iproute2
+fi
diff --git a/go.mod b/go.mod
@@ -23,6 +23,7 @@ require (
 	github.com/mmcloughlin/avo v0.0.0-20200523190732-4439b6b2c061 // indirect
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/pkg/profile v1.5.0
+	github.com/rakyll/statik v0.1.7
 	github.com/schollz/progressbar/v2 v2.15.0
 	github.com/shirou/gopsutil/v3 v3.21.4
 	github.com/sirupsen/logrus v1.8.1

diff --git a/go.sum b/go.sum
@@ -272,6 +272,8 @@ github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ=
+github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=

diff --git a/mainnet_rules.md b/mainnet_rules.md
diff --git a/pkg/visor/init.go b/pkg/visor/init.go
@@ -582,7 +582,7 @@ func initHypervisors(ctx context.Context, v *Visor, log *logging.Logger) error {
 }
 
 func initUptimeTracker(_ context.Context, v *Visor, log *logging.Logger) error {
-	const tickDuration = 1 * time.Minute
+	const tickDuration = 5 * time.Minute
 
 	conf := v.conf.UptimeTracker