Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
jdknives committed Oct 23, 2021
2 parents f222d9d + fc20ab7 commit 7d70c0b
Show file tree
Hide file tree
Showing 13 changed files with 583 additions and 56 deletions.
15 changes: 15 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
1 change: 1 addition & 0 deletions cmd/skywire-visor/static/7.1c17a3e5e903dcd94774.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions cmd/skywire-visor/static/8.bcc884fb2e3b89427677.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions cmd/skywire-visor/static/9.28280a196edf9818e2b5.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions cmd/skywire-visor/static/main.15c580f7b9d27bc805f3.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions cmd/skywire-visor/static/runtime.0496ec1834129c7e7b63.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions docker/images/visor/update.sh
Original file line number Diff line number Diff line change
@@ -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
118 changes: 67 additions & 51 deletions mainnet_rules.md

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions pkg/visor/visorconfig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ func MakeBaseConfig(common *Common) *V1 {
conf.UptimeTracker = &V1UptimeTracker{
Addr: skyenv.DefaultUptimeTrackerAddr,
}
conf.UptimeTracker = &V1UptimeTracker{
Addr: skyenv.DefaultUptimeTrackerAddr,
}
conf.CLIAddr = skyenv.DefaultRPCAddr
conf.LogLevel = skyenv.DefaultLogLevel
conf.LocalPath = skyenv.DefaultLocalPath
Expand Down
5 changes: 0 additions & 5 deletions skywire.go

This file was deleted.

Loading

0 comments on commit 7d70c0b

Please sign in to comment.