From b5a3ad7dbd032bb035e3e94c54411cb5cc31373b Mon Sep 17 00:00:00 2001 From: afeiszli Date: Wed, 14 Sep 2022 14:33:08 -0400 Subject: [PATCH] add * to allowed groups by default --- Dockerfile | 7 +++++-- logic/networks.go | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 35f1f052..d45080aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,14 @@ #first stage - builder FROM gravitl/go-builder as builder -ARG version +ARG version +ARG tags 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 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 # add a c lib diff --git a/logic/networks.go b/logic/networks.go index 2103a8fa..6e36372d 100644 --- a/logic/networks.go +++ b/logic/networks.go @@ -88,12 +88,17 @@ func CreateNetwork(network models.Network) (models.Network, error) { } network.AddressRange6 = normalizedRange } + network.SetDefaults() network.SetNodesLastModified() network.SetNetworkLastModified() pro.AddProNetDefaults(&network) + if len(network.ProSettings.AllowedGroups) == 0 { + network.ProSettings.AllowedGroups = []string{pro.DEFAULT_ALLOWED_GROUPS} + } + err := ValidateNetwork(&network, false) if err != nil { //logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))