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_docker b/Makefile_docker index 3c696a8f..d3cc862a 100644 --- a/Makefile_docker +++ b/Makefile_docker @@ -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