Skip to content
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

Makeup utilities #1742

Merged
merged 1 commit into from
Aug 17, 2024
Merged

Makeup utilities #1742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@ clean:

swag swagger:
cd src/ && $(MAKE) swag

# make compose will build and run the docker-compose file (DOCKER_BUILDKIT is for quick build)
compose:
DOCKER_BUILDKIT=1 docker compose up --build
6 changes: 3 additions & 3 deletions docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ services:
cb-mapui:
image: cloudbaristaorg/cb-mapui:0.9.2
container_name: cb-mapui
# build:
# context: ../cb-mapui
# dockerfile: Dockerfile
build:
context: ../cb-mapui
dockerfile: Dockerfile
networks:
- external_network
ports:
Expand Down
2 changes: 1 addition & 1 deletion init/init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

# Check for credential path
if not os.path.exists(CRED_PATH):
print(Fore.RED + "Error: CRED_PATH does not exist. Please run scripts/genCredential.sh first.")
print(Fore.RED + "Error: CRED_PATH does not exist. Please run init/genCredential.sh first.")
sys.exit(1)
elif not os.path.isfile(ENC_FILE_PATH):
print(Fore.RED + f"Error: {CRED_FILE_NAME_ENC} does not exist. Please check if it has been generated.")
Expand Down
2 changes: 1 addition & 1 deletion src/api/rest/server/mcir/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ func RestGetResource(c echo.Context) error {
// @Param resourceId path string true "Resource ID"
// @Success 200 {object} common.SimpleMsg
// @Failure 404 {object} common.SimpleMsg
// @Router /{nsId}/checkResource/{resourceType}/{resourceId} [get]
// @Router /ns/{nsId}/checkResource/{resourceType}/{resourceId} [get]
func RestCheckResource(c echo.Context) error {
reqID, idErr := common.StartRequestWithLog(c)
if idErr != nil {
Expand Down