gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-06 05:04:27 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix merge conflix

Browse source
This commit is contained in:
afeiszli 2021-12-11 12:14:55 -05:00
commit 81213486ec
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Dockerfile
View file

@ -1,14 +1,15 @@
#first stage - builder #first stage - builder
FROM golang:1.15-alpine as builder FROM golang:1.17-alpine as builder
ARG version ARG version
RUN apk add build-base RUN apk add build-base
WORKDIR /app WORKDIR /app
COPY . . COPY . .
ENV GO111MODULE=auto 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
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.13.6 FROM alpine:3.14.3
# add a c lib # add a c lib
RUN apk add gcompat iptables RUN apk add gcompat iptables
# set the working directory # set the working directory

2
logic/server.go
View file

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

7
logic/util.go
View file

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