gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-11-11 01:54:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #525 from gravitl/develop

Browse source 
Develop
This commit is contained in:
Alex 2021-11-30 21:18:28 -05:00 committed by GitHub
commit ec26998b9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker/Dockerfile-netclient-full
View file

@ -28,7 +28,7 @@ FROM alpine:3.13.6
WORKDIR /root/
RUN apk add --no-cache --update bash libmnl iptables openresolv iproute2
RUN apk add --no-cache --update bash libmnl gcompat iptables openresolv iproute2
COPY --from=builder /usr/bin/wireguard-go /usr/bin/wg* /usr/bin/
COPY --from=builder /app/netclient-app ./netclient
COPY --from=builder /app/scripts/netclient.sh .

2
netclient/command/commands.go
View file

@ -48,7 +48,7 @@ func Join(cfg config.ClientConfig, privateKey string) error {
} else {
ncutils.PrintLog("success", 0)
}
if strings.Contains(err.Error(), "ALREADY_INSTALLED") {
if err != nil && strings.Contains(err.Error(), "ALREADY_INSTALLED") {
ncutils.PrintLog(err.Error(), 0)
err = nil
}

4
netclient/main.go
View file

@ -216,8 +216,8 @@ func main() {
&cli.StringFlag{
Name: "roaming",
EnvVars: []string{"NETCLIENT_ROAMING"},
Value: "on",
Usage: "Checks for IP changes if 'on'. Ignores if 'off'. On by default.",
Value: "yes",
Usage: "Checks for IP changes if 'yes'. Ignores if 'no'. Yes by default.",
},
}