Skip to content

Commit 2b116ff

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/master'
2 parents 6ab6551 + 6bdeffe commit 2b116ff

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ RUN apk upgrade
1111
COPY --from=go-build /go/wireproxy/wireproxy /usr/bin/
1212

1313
VOLUME [ "/etc/wireproxy"]
14-
ENTRYPOINT [ "/usr/bin/wireproxy", "/etc/wireproxy/config" ]
14+
ENTRYPOINT [ "/usr/bin/wireproxy", "--config", "/etc/wireproxy/config" ]

wireguard.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ public_key=%s
2424
endpoint=%s
2525
persistent_keepalive_interval=%d
2626
preshared_key=%s
27-
allowed_ip=0.0.0.0/0`, conf.SelfSecretKey, conf.PeerPublicKey, conf.PeerEndpoint, conf.KeepAlive, conf.PreSharedKey)
27+
allowed_ip=0.0.0.0/0
28+
allowed_ip=::0/0`, conf.SelfSecretKey, conf.PeerPublicKey, conf.PeerEndpoint, conf.KeepAlive, conf.PreSharedKey)
2829

2930
setting := &DeviceSetting{ipcRequest: request, dns: conf.DNS, deviceAddr: conf.SelfEndpoint, mtu: conf.MTU}
3031
return setting, nil

0 commit comments

Comments
 (0)