From 8c0ec83a64bc13a147298afa6515d088a3cf0619 Mon Sep 17 00:00:00 2001 From: Pingping Lin Date: Tue, 1 Jun 2021 18:34:43 -0500 Subject: [PATCH 1/3] backend for ROC & add config to this folder --- Dockerfile | 2 -- Makefile | 2 +- Makefile_docker | 3 ++- backend/webui_service/webui_init.go | 2 +- config/webuicfg.yaml | 8 ++++++++ 5 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 config/webuicfg.yaml diff --git a/Dockerfile b/Dockerfile index 13e13b74..447d5b33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,6 @@ RUN cd $GOPATH/src && mkdir -p webconsole COPY . $GOPATH/src/webconsole RUN cd $GOPATH/src/webconsole \ - && make all \ && CGO_ENABLED=0 go build -a -installsuffix nocgo -o webconsole -x server.go FROM alpine:3.8 as webui @@ -43,4 +42,3 @@ RUN mkdir -p webconsole/ # Copy executable and default certs COPY --from=builder /go/src/webconsole/webconsole ./webconsole -COPY --from=builder /go/src/webconsole/public ./webconsole/public diff --git a/Makefile b/Makefile index 37ee6958..69a36c64 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ WEBCONSOLE_LDFLAGS = -X github.com/free5gc/version.VERSION=$(VERSION) \ .DEFAULT_GOAL: nfs -all: $(WEBCONSOLE) + all: $(WEBCONSOLE) $(WEBCONSOLE): $(GO_BIN_PATH)/$(WEBCONSOLE) diff --git a/Makefile_docker b/Makefile_docker index 3c696a8f..dcfc9889 100644 --- a/Makefile_docker +++ b/Makefile_docker @@ -11,7 +11,7 @@ DOCKER_REGISTRY ?= DOCKER_REPOSITORY ?= DOCKER_TAG ?= ${VERSION} DOCKER_IMAGENAME := ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}${PROJECT_NAME}:${DOCKER_TAG} -DOCKER_BUILDKIT ?= 1 +DOCKER_BUILDKIT ?= 0 DOCKER_BUILD_ARGS ?= ## Docker labels. Only set ref and commit date if committed @@ -27,6 +27,7 @@ docker-build: for target in $(DOCKER_TARGETS); do \ DOCKER_BUILDKIT=$(DOCKER_BUILDKIT) docker build $(DOCKER_BUILD_ARGS) \ --target $$target \ + --no-cache \ --tag ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}5gc-$$target:${DOCKER_TAG} \ --build-arg org_label_schema_version="${VERSION}" \ --build-arg org_label_schema_vcs_url="${DOCKER_LABEL_VCS_URL}" \ diff --git a/backend/webui_service/webui_init.go b/backend/webui_service/webui_init.go index 460e9d39..7af38a40 100644 --- a/backend/webui_service/webui_init.go +++ b/backend/webui_service/webui_init.go @@ -63,7 +63,7 @@ func (webui *WEBUI) Initialize(c *cli.Context) { panic(err) } } else { - DefaultWebUIConfigPath := path_util.Free5gcPath("free5gc/config/webuicfg.yaml") + DefaultWebUIConfigPath := path_util.Free5gcPath("webconsole/config/webuicfg.yaml") if err := factory.InitConfigFactory(DefaultWebUIConfigPath); err != nil { panic(err) } diff --git a/config/webuicfg.yaml b/config/webuicfg.yaml new file mode 100644 index 00000000..d15c2123 --- /dev/null +++ b/config/webuicfg.yaml @@ -0,0 +1,8 @@ +info: + version: 1.0.0 + description: WebUI initial local configuration + +configuration: + mongodb: # the mongodb connected by this webui + name: free5gc # name of the mongodb + url: mongodb://localhost:27017 # a valid URL of the mongodb From 185947b0d2275b1860f8b9b291e1a2c6b13cbb36 Mon Sep 17 00:00:00 2001 From: Pingping Lin Date: Tue, 1 Jun 2021 18:37:05 -0500 Subject: [PATCH 2/3] recover the DOCKER_BUILDKIT value --- Makefile_docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile_docker b/Makefile_docker index dcfc9889..d3cc862a 100644 --- a/Makefile_docker +++ b/Makefile_docker @@ -11,7 +11,7 @@ DOCKER_REGISTRY ?= DOCKER_REPOSITORY ?= DOCKER_TAG ?= ${VERSION} DOCKER_IMAGENAME := ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}${PROJECT_NAME}:${DOCKER_TAG} -DOCKER_BUILDKIT ?= 0 +DOCKER_BUILDKIT ?= 1 DOCKER_BUILD_ARGS ?= ## Docker labels. Only set ref and commit date if committed From e87364d07e8d51d356c2835bb98bfd31d4597194 Mon Sep 17 00:00:00 2001 From: pingping-lin Date: Fri, 11 Jun 2021 15:05:26 -0700 Subject: [PATCH 3/3] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 69a36c64..37ee6958 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ WEBCONSOLE_LDFLAGS = -X github.com/free5gc/version.VERSION=$(VERSION) \ .DEFAULT_GOAL: nfs - all: $(WEBCONSOLE) +all: $(WEBCONSOLE) $(WEBCONSOLE): $(GO_BIN_PATH)/$(WEBCONSOLE)