Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change module to github.com/SpiderOak/webwormhole #3

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

change module to github.com/SpiderOak/webwormhole #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8710bdf
use replace instead of changing module name
Jul 13, 2021
74ebc6a
use relative path for wormhole replace
Jul 13, 2021
c0ae306
example
elagergren-spideroak Jul 15, 2021
66cf2a7
change package name
Jul 16, 2021
2541c8a
add main function
Jul 16, 2021
7aada39
remove web package to main
Jul 27, 2021
ca9472d
Merge branch 'feature/FLOW-1966-wormhole-docker-image' of github.com:…
scspideroak Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ RUN apk --no-cache add ca-certificates
COPY --from=build /src/ww /bin
COPY --from=build /src/web /web
WORKDIR /
ENTRYPOINT ["/bin/ww", "server", "-https="]
ENTRYPOINT /bin/ww server $WW
4 changes: 2 additions & 2 deletions cmd/ww/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strconv"

"rsc.io/qr"
"webwormhole.io/wordlist"
"webwormhole.io/wormhole"
"github.com/SpiderOak/webwormhole/wordlist"
"github.com/SpiderOak/webwormhole/wormhole"
)

var subcmds = map[string]func(args ...string){
Expand Down
2 changes: 1 addition & 1 deletion cmd/ww/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/prometheus/client_golang/prometheus/promhttp"
"golang.org/x/crypto/acme/autocert"
"nhooyr.io/websocket"
"webwormhole.io/wormhole"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why don't we use the replace keyword on the flow repo instead? https://stackoverflow.com/questions/14323872/using-forked-package-import-in-go

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant to add the replace on the flow repo, not in this one. But am not sure exactly what's needed here.

What we need in FLOW-1966 is to run the docker image that can be built by this fork in tr. As discussed in the meetings, If we need to use git submodules then I believe that's a-ok too.

"github.com/SpiderOak/webwormhole/wormhole"
)

// slotTimeout is the the maximum amount of time a client is allowed to
Expand Down
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ require (
nhooyr.io/websocket v1.8.5
rsc.io/qr v0.2.0
)

replace webwormhole.io => ./webwormhole
3 changes: 3 additions & 0 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package main

func main() {}
2 changes: 1 addition & 1 deletion web/webwormhole.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"syscall/js"

"filippo.io/cpace"
"github.com/SpiderOak/webwormhole/wordlist"
"golang.org/x/crypto/hkdf"
"golang.org/x/crypto/nacl/secretbox"
"rsc.io/qr"
"webwormhole.io/wordlist"
)

// state is the PAKE state so far.
Expand Down