wip

Dockerfile

@@ -6,7 +6,7 @@ RUN npm install
 COPY ./website/ ./
 RUN npm run build
 
-FROM golang:1.13 as server
+FROM golang:1.13.8 as server
 WORKDIR /code
 ENV GOOS=linux
 ENV GARCH=amd64
@@ -15,6 +15,7 @@ ENV GO111MODULE=on
 COPY ./go.mod ./
 COPY ./go.sum ./
 RUN go mod download
+COPY ./proto/ ./proto/
 COPY ./main.go ./main.go
 COPY ./internal/ ./internal
 RUN go build -o server

README.md

@@ -46,7 +46,6 @@ Soon I hope to add the following features
 docker run \
   -it \
   --rm \
-  --name wg \
   --cap-add NET_ADMIN \
   --device /dev/net/tun:/dev/net/tun \
   -p 8000:8000/tcp \

internal/services/server_service.go

@@ -3,10 +3,10 @@ package services
 import (
 	"context"
 
-	"github.com/place1/wg-embed/pkg/wgembed"
 	"github.com/place1/wg-access-server/internal/auth/authsession"
 	"github.com/place1/wg-access-server/internal/config"
 	"github.com/place1/wg-access-server/proto/proto"
+	"github.com/place1/wg-embed/pkg/wgembed"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -37,5 +37,6 @@ func (s *ServerService) Info(ctx context.Context, req *proto.InfoReq) (*proto.In
 		Host:      stringValue(s.Config.WireGuard.ExternalAddress),
 		PublicKey: publicKey,
 		Port:      int32(port),
+		HostVpnIp: ServerVPNIP(s.Config.VPN.CIDR).IP.String(),
 	}, nil
 }