From c2460c576e3820c570d2744279a4d24b5b64fc16 Mon Sep 17 00:00:00 2001
From: 0xdcarns <dillon.carns@gmail.com>
Date: Sat, 11 Dec 2021 12:07:54 -0500
Subject: [PATCH] nil pointers, update version

---
 Dockerfile      | 4 ++--
 logic/server.go | 2 +-
 logic/util.go   | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 49d64a52..15bae4a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
 #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
-FROM alpine:3.13.6
+FROM alpine:3.14.3
 # add a c lib
 RUN apk add gcompat iptables
 # set the working directory
diff --git a/logic/server.go b/logic/server.go
index f6f5213c..8bda9ef9 100644
--- a/logic/server.go
+++ b/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
diff --git a/logic/util.go b/logic/util.go
index 62fd5070..d7ce5534 100644
--- a/logic/util.go
+++ b/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