fix merge conflix

Dockerfile

@@ -1,14 +1,15 @@
 #first stage - builder
-FROM golang:1.15-alpine as builder
+FROM golang:1.17-alpine as builder
 ARG version
 RUN apk add build-base
 WORKDIR /app
 COPY . .
 ENV GO111MODULE=auto
 
-# RUN GOOS=linux CGO_ENABLED=1 go build -ldflags="-s -X 'main.version=$version'" -o netmaker main.go
-RUN GOOS=linux CGO_ENABLED=1 go build -tags debug -ldflags="-s -X 'main.version=$version'" -o netmaker main.go
-FROM alpine:3.13.6
+# RUN GOOS=linux CGO_ENABLED=1 go build -tags debug -ldflags="-s -X 'main.version=$version'" -o netmaker main.go
+RUN GOOS=linux CGO_ENABLED=1 go build -ldflags="-s -X 'main.version=$version'" -o netmaker main.go
+FROM alpine:3.14.3
+
 # add a c lib
 RUN apk add gcompat iptables
 # set the working directory

logic/server.go

@@ -129,7 +129,7 @@ func ServerJoin(network string, serverID string, privateKey string) error {
 
 // ServerCheckin - runs pulls and pushes for server
 func ServerCheckin(mac string, network string) error {
-	var serverNode *models.Node
+	var serverNode = &models.Node{}
 	var currentNode, err = GetNode(mac, network)
 	if err != nil {
 		return err

logic/util.go

@@ -197,8 +197,8 @@ func GetNodePeers(networkName string, excludeRelayed bool) ([]models.Node, error
 		logger.Log(2, errN.Error())
 	}
 	for _, value := range collection {
-		var node *models.Node
-		var peer models.Node
+		var node = &models.Node{}
+		var peer = models.Node{}
 		err := json.Unmarshal([]byte(value), node)
 		if err != nil {
 			logger.Log(2, err.Error())
@@ -248,7 +248,7 @@ func GetPeersList(networkName string, excludeRelayed bool, relayedNodeAddr strin
 		var relayNode models.Node
 		relayNode, err = GetNodeRelay(networkName, relayedNodeAddr)
 		if relayNode.Address != "" {
-			var peerNode = setPeerInfo(&relayNode) // WHAT DO
+			var peerNode = setPeerInfo(&relayNode)
 			network, err := GetNetwork(networkName)
 			if err == nil {
 				peerNode.AllowedIPs = append(peerNode.AllowedIPs, network.AddressRange)
@@ -286,7 +286,6 @@ func RandomString(length int) string {
 
 // == Private Methods ==
 
-// WHAT DO
 func setPeerInfo(node *models.Node) models.Node {
 	var peer models.Node
 	peer.RelayAddrs = node.RelayAddrs