From 553ab7ab83bbdd55689e21647e5c8820813a4b8b Mon Sep 17 00:00:00 2001 From: afeiszli Date: Thu, 8 Sep 2022 11:09:25 -0400 Subject: [PATCH] modifying script for vpn --- docker/Dockerfile-netclient-multiarch-kernel | 22 ++++++++++++++++++++ scripts/nm-quick.sh | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 docker/Dockerfile-netclient-multiarch-kernel diff --git a/docker/Dockerfile-netclient-multiarch-kernel b/docker/Dockerfile-netclient-multiarch-kernel new file mode 100644 index 00000000..f2455a2f --- /dev/null +++ b/docker/Dockerfile-netclient-multiarch-kernel @@ -0,0 +1,22 @@ +FROM gravitl/go-builder as builder +# add glib support daemon manager +WORKDIR /app +ARG version + +COPY . . + +ENV GO111MODULE=auto + +RUN GOOS=linux CGO_ENABLED=0 /usr/local/go/bin/go build -ldflags="-X 'main.version=${version}'" -o netclient-app netclient/main.go + +FROM alpine:3.15.2 + +WORKDIR /root/ + +RUN apk add --no-cache --update bash libmnl gcompat iptables openresolv iproute2 wireguard-tools +COPY --from=builder /app/netclient-app ./netclient +COPY --from=builder /app/scripts/netclient.sh . +RUN chmod 0755 netclient && chmod 0755 netclient.sh + + +ENTRYPOINT ["/bin/bash", "./netclient.sh"] diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh index 51897773..acecbef5 100755 --- a/scripts/nm-quick.sh +++ b/scripts/nm-quick.sh @@ -230,7 +230,7 @@ echo "Netmaker setup is now complete. You are ready to begin using Netmaker." setup_vpn() {( set -e echo "creating vpn network (10.201.0.0/16)" -curl -s -o /dev/null -d '{"addressrange":"10.201.0.0/16","netid":"vpn","defaultextclientdns":"8.8.8.8"}' -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' https://api.${NETMAKER_BASE_DOMAIN}/api/networks +curl -s -o /dev/null -d '{"addressrange":"10.201.0.0/16","netid":"vpn","defaultextclientdns":"10.201.255.254"}' -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' https://api.${NETMAKER_BASE_DOMAIN}/api/networks sleep 5 @@ -257,7 +257,7 @@ SERVER_ID=$(jq -r '.[0].id' <<< ${curlresponse}) EGRESS_JSON=$( jq -n \ --arg gw "$GATEWAY_IFACE" \ - '{ranges: ["0.0.0.0/0","::/0"], interface: $gw}' ) + '{ranges: ["0.0.0.0/0"], interface: $gw}' ) echo "egress json: $EGRESS_JSON" curl -s -o /dev/null -X POST -d "$EGRESS_JSON" -H "Authorization: Bearer $MASTER_KEY" -H 'Content-Type: application/json' https://api.${NETMAKER_BASE_DOMAIN}/api/nodes/vpn/$SERVER_ID/creategateway