Browse Source

add * to allowed groups by default

afeiszli 2 years ago
parent
commit
b5a3ad7dbd
2 changed files with 10 additions and 2 deletions
  1. 5 2
      Dockerfile
  2. 5 0
      logic/networks.go

+ 5 - 2
Dockerfile

@@ -1,11 +1,14 @@
 #first stage - builder
 #first stage - builder
 FROM gravitl/go-builder as builder
 FROM gravitl/go-builder as builder
-ARG version 
+ARG version
+ARG tags 
 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 apk add git
+RUN GOOS=linux CGO_ENABLED=1 go build ${tags} -ldflags="-s -X 'main.version=${version}'" .
+# RUN go build -tags=ee . -o netmaker main.go
 FROM alpine:3.15.2
 FROM alpine:3.15.2
 
 
 # add a c lib
 # add a c lib

+ 5 - 0
logic/networks.go

@@ -88,12 +88,17 @@ func CreateNetwork(network models.Network) (models.Network, error) {
 		}
 		}
 		network.AddressRange6 = normalizedRange
 		network.AddressRange6 = normalizedRange
 	}
 	}
+
 	network.SetDefaults()
 	network.SetDefaults()
 	network.SetNodesLastModified()
 	network.SetNodesLastModified()
 	network.SetNetworkLastModified()
 	network.SetNetworkLastModified()
 
 
 	pro.AddProNetDefaults(&network)
 	pro.AddProNetDefaults(&network)
 
 
+	if len(network.ProSettings.AllowedGroups) == 0 {
+		network.ProSettings.AllowedGroups = []string{pro.DEFAULT_ALLOWED_GROUPS}
+	}
+
 	err := ValidateNetwork(&network, false)
 	err := ValidateNetwork(&network, false)
 	if err != nil {
 	if err != nil {
 		//logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
 		//logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))