checkpoint commit

Author: jmwample

cmd/cli/README.md

@@ -1,10 +1,10 @@
-# Gotapdance CLI version
+# Conjure Client Test CLI
 
 # Build
 After [downloading Golang, TD and dependencies:](../README.md)
 
 ```sh
-   cd ${GOPATH:-~/go}/src/github.com/refraction-networking/gotapdance/cli # works even if GOPATH is not set
+   cd conjure/cmd/cli # works even if GOPATH is not set
    go build -a .
 ```
 
@@ -13,7 +13,7 @@ After [downloading Golang, TD and dependencies:](../README.md)
 Simply run
 
 ```sh
-./cli
+./cli -connect-addr="<host:port>"
 ```
 
 to listen to local connections on default 10500 port.
@@ -73,10 +73,10 @@ To build the docker environemnt use:
 
 ```sh
 # run from repo root
-docker build -t gotapdance/cli -f cli/cli.dockerfile .
+docker build -t conjure/cli -f cmd/cli/cli.dockerfile cmd/cli/
 ```
 
-The environemnt can then be attached to using a `docker exec` or using telnet
+The environment can then be attached to using a `docker exec` or using telnet
 in the case of gns3. See the [wiki page](https://docs.gns3.com/docs/emulators/create-a-docker-container-for-gns3)
 for local docker image builds in gns3 for more details on setting up local
 docker appliances in gns3.

cmd/cli/cli.dockerfile

@@ -1,15 +1,11 @@
-FROM golang:1.20
+FROM golang:latest
 
 RUN apt-get update
 RUN apt-get install -y -f libzmq3-dev
 
-WORKDIR /go/src/github/refracction-networking/gotapdance
-COPY . .
+WORKDIR /go/src/github/refracction-networking/conjure
+COPY cmd/cli /cli
 
-# RUN go get -d -v ./...
 RUN go mod download
 RUN go mod tidy
-RUN go install ./cli 
-
-# no run / entrypoint specified. this containter is meant to be run w/
-# gns3 and connected to using terminal or telnet.
+RUN go install ./cmd/cli

dialer.go

@@ -93,7 +93,7 @@ func (d *Dialer) Dial(network, address string) (net.Conn, error) {
 }
 
 // DialContext connects to the address on the named network using the provided context.
-// Long deadline is strongly advised, since tapdance will try multiple decoys.
+// Long deadline is advised, since conjure may try multiple registration strategies.
 //
 // The only supported network at this time: "tcp".
 // The address has the form "host:port".