Skip to content

Commit

Permalink
refactor(make): add static linking for alpine based build
Browse files Browse the repository at this point in the history
fix(client/proxy): forget to add proxy on args builder
  • Loading branch information
ikr4-m committed Aug 9, 2024
1 parent 64e99da commit 61e71f3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ restore:
go get -C ./internal

build-client: restore
go build -C ./cmd/mdrop-client -ldflags="-linkmode external -extldflags -w -s" -o "../../mdrop"
go build -C ./cmd/mdrop-client -ldflags="-linkmode external -extldflags -static -w -s" -o "../../mdrop"

build-tunnel: restore
go build -C ./cmd/mdrop-tunnel-tools -ldflags="-linkmode external -extldflags -static -w -s" -o "../../mdrop-tunnel"
Expand Down
3 changes: 3 additions & 0 deletions internal/shell.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ func (s SSHParameter) GenerateConnectSSHArgs() string {
"tunnel@" + s.ConfigFile.Host,
}
args = append(args, s.Command...)
s.GenerateProxyArgs(&args)

return "ssh "+strings.Join(args, " ")
}

Expand All @@ -51,6 +53,7 @@ func (s SSHParameter) GenerateRemoteSSHArgs() string {
args...,
)
}
s.GenerateProxyArgs(&args)

return "ssh "+strings.Join(args, " ")
}
Expand Down

0 comments on commit 61e71f3

Please sign in to comment.