Merge pull request #125

Release v0.6.1

Dockerfile

@@ -1,16 +1,11 @@
 FROM golang:1.20-alpine3.17 AS build
 
-COPY . /go/src/github.com/sentinel-official/dvpn-node/
+COPY . /root/dvpn-node/
 
-RUN apk add git gcc linux-headers make musl-dev && \
-    cd /go/src/github.com/sentinel-official/dvpn-node/ && \
-    make install --jobs=$(nproc)
-
-RUN cd /root/ && \
-    apk add autoconf automake bash file g++ git libtool make unbound-dev && \
-    git clone https://github.com/handshake-org/hnsd.git --branch=master --depth=1 && \
-    cd /root/hnsd/ && \
-    bash autogen.sh && sh configure && make --jobs=$(nproc)
+RUN apk add autoconf automake bash file g++ gcc git libtool linux-headers make musl-dev unbound-dev && \
+    cd /root/dvpn-node/ && make --jobs=$(nproc) install && \
+    git clone --branch=master --depth=1 https://github.com/handshake-org/hnsd.git /root/hnsd && \
+    cd /root/hnsd/ && bash autogen.sh && sh configure && make --jobs=$(nproc)
 
 FROM alpine:3.17
 

cmd/start.go

@@ -208,14 +208,14 @@ func StartCmd() *cobra.Command {
 			router.Use(corsMiddleware)
 			api.RegisterRoutes(ctx, router)
 
-			ctx = ctx.WithLogger(log).
-				WithService(service).
-				WithHandler(router).
-				WithConfig(config).
+			ctx = ctx.WithBandwidth(bandwidth).
 				WithClient(client).
-				WithLocation(location).
+				WithConfig(config).
 				WithDatabase(database).
-				WithBandwidth(bandwidth)
+				WithHandler(router).
+				WithLocation(location).
+				WithLogger(log).
+				WithService(service)
 
 			n := node.NewNode(ctx)
 			if err := n.Initialize(); err != nil {

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/rs/zerolog v1.29.0
 	github.com/sentinel-official/hub v0.10.1
-	github.com/showwin/speedtest-go v1.5.0
+	github.com/showwin/speedtest-go v1.5.2
 	github.com/soheilhy/cmux v0.1.5
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/viper v1.14.0

go.sum

@@ -776,8 +776,8 @@ github.com/seiflotfy/cuckoofilter v0.0.0-20220312154859-af7fbb8e765b/go.mod h1:b
 github.com/sentinel-official/hub v0.10.1 h1:DcXrd7dGJnbRS0r7uOltzjATo2ImuPqLrRsSfaxa6G4=
 github.com/sentinel-official/hub v0.10.1/go.mod h1:WX64FXc/7qNnE2I3yOMjcKeek02zE/mZFbZvJBweOHk=
 github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/showwin/speedtest-go v1.5.0 h1:g+oy5HeemQ0LusWOYY1UHiasC6EsHsut76u4Hqq8alY=
-github.com/showwin/speedtest-go v1.5.0/go.mod h1:Y7c+pxzaNAlo4mYP+x83pnYY8IM3bkHGDhTdrgUnkNE=
+github.com/showwin/speedtest-go v1.5.2 h1:drXsmaGC36VXi6biSZ+vyo/tYCkaoTU2mAF2b6wQmlk=
+github.com/showwin/speedtest-go v1.5.2/go.mod h1:Y7c+pxzaNAlo4mYP+x83pnYY8IM3bkHGDhTdrgUnkNE=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=