diff --git a/docs/dockerized.md b/docs/dockerized.md index 126c4c76f..8e888ee77 100644 --- a/docs/dockerized.md +++ b/docs/dockerized.md @@ -23,9 +23,9 @@ $ docker run --network="br-dmsg0" --rm --name=redis -d -p 6379:6379 redis:alpine ``` 5. Run `dmsg-discovery` and `dmsg-server` ```bash -$ docker run --rm --network="br-dmsg0" --name=dmsg-discovery skycoinpro/dmsg-discovery:test --redis redis://redis:6379 +$ docker run --rm --network="br-dmsg0" --name=dmsg-discovery skycoin/dmsg-discovery:test --redis redis://redis:6379 # Run dmsg-server with default config (default points to production server) -$ docker run --network="br-dmsg0" --rm --name=dmsg-server skycoinpro/dmsg-server:test +$ docker run --network="br-dmsg0" --rm --name=dmsg-server skycoin/dmsg-server:test # or run it with your own config $ docker run -v :/etc/dmsg --network="br-dmsg0" --rm --name=dmsg-server \ skycoinpro/dmsg-server:test / diff --git a/vendor/github.com/hashicorp/yamux/go.mod b/vendor/github.com/hashicorp/yamux/go.mod new file mode 100644 index 000000000..dd8974d3f --- /dev/null +++ b/vendor/github.com/hashicorp/yamux/go.mod @@ -0,0 +1,3 @@ +module github.com/hashicorp/yamux + +go 1.15 diff --git a/vendor/modules.txt b/vendor/modules.txt index 5635b05da..1ac76038a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -40,9 +40,15 @@ github.com/go-redis/redis/v8/internal/util # github.com/golang/protobuf v1.5.0 ## explicit; go 1.9 # github.com/google/go-cmp v0.5.7 +<<<<<<< HEAD +## explicit +# github.com/hashicorp/yamux v0.1.1 +## explicit +======= ## explicit; go 1.11 # github.com/hashicorp/yamux v0.1.1 ## explicit; go 1.15 +>>>>>>> 03740e62d9661c0b328bc8aacb19fbc884408033 github.com/hashicorp/yamux # github.com/inconshreveable/mousetrap v1.0.0 ## explicit