Skip to content

backend for ROC & add config to this folder #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ghost wants to merge 5 commits into from
Closed

backend for ROC & add config to this folder #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
193571b
Merge pull request #1 from omec-project/onf-release3.0.5-roc
Jun 1, 2021
8c0ec83
backend for ROC & add config to this folder
Jun 1, 2021
185947b
recover the DOCKER_BUILDKIT value
Jun 1, 2021
827b458
Merge branch 'omec-project:onf-release3.0.5-roc' into onf-release3.0.…
Jun 8, 2021
e87364d
Update Makefile
Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
1 change: 1 addition & 0 deletions Makefile_docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Copy link
Contributor

@thakurajayL thakurajayL Jun 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why we need this ?this will slow down the build process right ?

Copy link
Author

@ghost ghost Jun 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why we need this ?this will slow down the build process right ?

I replied this yesterday, but looks did not show up, reply again. If with cache some times the building result is not correct, for this reason, I waste a lot of time on debugging, and find it did not work just because used cache. Compare with the saved time, i would rather choose to build without cache. If you prefer with cache, I will change it back.

--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}" \
Expand Down
2 changes: 1 addition & 1 deletion backend/webui_service/webui_init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Contributor

@thakurajayL thakurajayL Jun 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's discuss this in meeting. we are changing configpath. DId we change helm chart for the same ?

Copy link
Contributor

@thakurajayL thakurajayL Jun 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is yaml file, .conf file. I am not sure how it works.

if err := factory.InitConfigFactory(DefaultWebUIConfigPath); err != nil {
panic(err)
}
Expand Down
8 changes: 8 additions & 0 deletions config/webuicfg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
info:
Copy link
Contributor

@thakurajayL thakurajayL Jun 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this the same config we are pulling from 5gc repository ? or this is something else?

Copy link
Author

@ghost ghost Jun 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, because it uses the config in another repo. In this way, the webconsole repo will not depend on other repo.

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