Skip to content

Commit acee4ea

Browse files
authored
Merge pull request #91 from MZC-CSC/feature-v0.4.0-jsyoo
This PR includes documentation improvements, health check bug fixes, and health check configuration updates.
2 parents dc8db23 + c7af0d4 commit acee4ea

File tree

7 files changed

+13
-8
lines changed

7 files changed

+13
-8
lines changed

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,14 @@ This section describes the minimal process for those who want to set up quickly.
4747
For more detailed installation guide, please refer to the [Running on Single Instance Guide](https://github.com/m-cmp/mc-admin-cli/blob/main/docs/running-on-instance.md) document.
4848

4949
First, clone the repository.
50+
For stable infrastructure deployment, it is recommended to explicitly clone a specific [released version](https://github.com/m-cmp/mc-admin-cli/releases) using the `-b` flag instead of using the latest development version.
51+
(Example) v0.4.1
5052
```shell
51-
git clone https://github.com/m-cmp/mc-admin-cli.git
53+
git clone https://github.com/m-cmp/mc-admin-cli.git -b v0.4.1
5254
cd mc-admin-cli/bin
5355
```
5456

57+
5558
For [mc-data-manager](https://github.com/cloud-barista/mc-data-manager/blob/main/docs/Datamanager-Docker-Guide.md) configuration, you need to copy and edit `profile.json` which will be used for csp credenticals.
5659
```shell
5760
cp ../conf/docker/conf/mc-data-manager/data/var/run/data-manager/profile/sample.json ./profile.json

README_kr.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ sudo apt-get install -y docker-ce docker-ce-cli docker-compose-plugin
4747
더 자세한 설치 가이드를 원하시면 [단일 인스턴스에서 실행하기 가이드](https://github.com/m-cmp/mc-admin-cli/blob/main/docs/running-on-instance.md) 문서를 참조하세요.
4848

4949
먼저 저장소를 클론합니다.
50+
안정적인 인프라 구축을 위해 최신 개발 버전 대신 `-b` 플래그를 사용하여 특정 [릴리스 버전](https://github.com/m-cmp/mc-admin-cli/releases)을 명시적으로 클론하는 것을 권장합니다.
51+
(예시) v0.4.1
5052
```shell
51-
git clone https://github.com/m-cmp/mc-admin-cli.git
53+
git clone https://github.com/m-cmp/mc-admin-cli.git -b v0.4.1
5254
cd mc-admin-cli/bin
5355
```
5456

conf/docker/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Common Use case
22
HEALTH_CHECK_INTERVAL=1m
33
HEALTH_CHECK_TIMEOUT=5s
4-
HEALTH_CHECK_RETIES="3"
4+
HEALTH_CHECK_RETRIES="3"
55
HEALTH_CHECK_START_PERIOD=60s
66

77
UID=1000

conf/docker/.env.setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Common Use case
22
HEALTH_CHECK_INTERVAL=1m
33
HEALTH_CHECK_TIMEOUT=5s
4-
HEALTH_CHECK_RETIES="3"
4+
HEALTH_CHECK_RETRIES="3"
55
HEALTH_CHECK_START_PERIOD=60s
66

77

conf/docker/conf/mc-web-console/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ CONSOLE_POSTGRES_PASSWORD=mcwebconsolepassword
1111
# 헬스 체크 설정
1212
HEALTH_CHECK_INTERVAL=30s
1313
HEALTH_CHECK_TIMEOUT=10s
14-
HEALTH_CHECK_RETIES=3
14+
HEALTH_CHECK_RETRIES=3
1515
HEALTH_CHECK_START_PERIOD=40s

conf/docker/docker-compose.mini.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
x-default-health-check: &default-health-check
22
interval: ${HEALTH_CHECK_INTERVAL}
33
timeout: ${HEALTH_CHECK_TIMEOUT}
4-
retries: ${HEALTH_CHECK_RETIES}
4+
retries: ${HEALTH_CHECK_RETRIES}
55
start_period: ${HEALTH_CHECK_START_PERIOD}
66

77
networks:

conf/docker/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
x-default-health-check: &default-health-check
22
interval: ${HEALTH_CHECK_INTERVAL}
33
timeout: ${HEALTH_CHECK_TIMEOUT}
4-
retries: ${HEALTH_CHECK_RETIES}
4+
retries: ${HEALTH_CHECK_RETRIES}
55
start_period: ${HEALTH_CHECK_START_PERIOD}
66

77
networks:
@@ -1119,7 +1119,7 @@ services:
11191119
sleep infinity
11201120
"
11211121
healthcheck:
1122-
test: [ "CMD", "/app/tool/mcc", "rest", "get", "http://localhost:8974/health" ]
1122+
test: [ "CMD", "/app/tool/mcc", "rest", "get", "http://localhost:9002/health" ]
11231123
<<: *default-health-check
11241124

11251125
mc-observability-mcp-grafana:

0 commit comments

Comments
 (0)