erik/converge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

converge now uses flags for the command-line parsing.

Browse Source
This commit is contained in:
Erik Brakkee 2024-07-23 21:07:41 +02:00
parent ff1c13cc98
commit bc12d13c16
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -21,4 +21,4 @@ COPY --from=builder /opt/converge/bin/agent \
/opt/converge/docs/ /opt/converge/docs/
COPY --from=builder /opt/converge/static/ /opt/converge/docs/ COPY --from=builder /opt/converge/static/ /opt/converge/docs/
ENTRYPOINT ["/opt/converge/bin/converge", "/opt/converge/docs" ] ENTRYPOINT ["/opt/converge/bin/converge", "-docsdir", "/opt/converge/docs" ]

26
cmd/converge/server.go
View File

@ -3,6 +3,7 @@ package main
import ( import (
"converge/pkg/converge" "converge/pkg/converge"
"converge/pkg/websocketutil" "converge/pkg/websocketutil"
"flag"
"fmt" "fmt"
"log" "log"
"net" "net"
@ -26,11 +27,30 @@ func catchAllHandler(w http.ResponseWriter, r *http.Request) {
} }
func main() { func main() {
downloadOption := flag.String("docsdir", "downloads",
"directory where documentation is located, either relative to current directory or an absolute path")
downloadDir := "downloads" flag.Usage = func() {
if len(os.Args) == 2 { fmt.Fprintln(os.Stderr, "Usage: converge [options]")
downloadDir = os.Args[1] fmt.Fprintln(os.Stderr)
fmt.Fprintln(os.Stderr, "Converge server is a rendez-vous server for debugging continuous integration")
fmt.Fprintln(os.Stderr, "jobs be providing the capability to log into the agents where jobs are running.")
fmt.Fprintln(os.Stderr, "This is achieve by starting an agent in the continuous integration job")
fmt.Fprintln(os.Stderr, "which connects to Converge using a websocket connection. The end user also connects")
fmt.Fprintln(os.Stderr, "to Converge using ssh over websockets. The server then matches the end-user with")
fmt.Fprintln(os.Stderr, "the agent running in the continous integration job (the rendez-vous) and sets up")
fmt.Fprintln(os.Stderr, "an end-to-end SSH connection between end-user and agent, with the agent providing")
fmt.Fprintln(os.Stderr, "an embedded SSH server to provide interactive access to the end-user. This works")
fmt.Fprintln(os.Stderr, "both on linux and on windows.")
fmt.Fprintln(os.Stderr)
flag.PrintDefaults()
} }
flag.Parse()
if flag.NArg() != 0 {
flag.Usage()
os.Exit(1)
}
downloadDir := *downloadOption
log.Println("Doanload directory", downloadDir) log.Println("Doanload directory", downloadDir)
admin := converge.NewAdmin() admin := converge.NewAdmin()