mirror of
https://github.com/go-sigma/sigma.git
synced 2026-10-28 13:34:34 +08:00
fix(rs3): probe /readyz and drop unused RS3_ENDPOINT
The rs3 server binary never reads RS3_ENDPOINT; it is a client-only setting for rs3-cli, which only the old healthcheck used. Switch the rs3 healthcheck to `curl --fail .../readyz` with a start period (matching scripts/run_rs3.sh and CI) and remove the now-dead RS3_ENDPOINT from compose.yml, the demo-server compose, run_rs3.sh, and the test workflow. Verification: - git grep RS3_ENDPOINT -> no matches - docker compose config for compose.yml and tools/demo-server/compose.yml
This commit is contained in:
1 parent
bb9b02adf4
commit
f6d7a97cdf
4 files changed
+10
-12
No files matched your search
@@ -45,7 +45,6 @@ jobs:
|
||||
RS3_DATA_DIR: /var/lib/rs3/data
|
||||
RS3_ACCESS_KEY: sigma
|
||||
RS3_SECRET_KEY: sigma-sigma
|
||||
RS3_ENDPOINT: http://127.0.0.1:9000
|
||||
ports:
|
||||
- 9000:9000
|
||||
entrypoint: /bin/sh
|
||||
|
||||
+5
-5
@@ -68,7 +68,6 @@ services:
|
||||
RS3_DATA_DIR: /var/lib/rs3/data
|
||||
RS3_ACCESS_KEY: sigma
|
||||
RS3_SECRET_KEY: sigma-sigma
|
||||
RS3_ENDPOINT: http://127.0.0.1:9000
|
||||
entrypoint:
|
||||
- /bin/sh
|
||||
- -c
|
||||
@@ -76,10 +75,11 @@ services:
|
||||
volumes:
|
||||
- ${PWD}/storage/rs3:/var/lib/rs3/data
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "rs3-cli ls s3://sigma >/dev/null 2>&1"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
test: ["CMD-SHELL", "curl --fail http://127.0.0.1:$$RS3_PORT/readyz || exit 1"]
|
||||
interval: 30s
|
||||
timeout: 3s
|
||||
start_period: 5s
|
||||
retries: 3
|
||||
networks:
|
||||
- default
|
||||
networks:
|
||||
|
||||
@@ -9,7 +9,6 @@ DOCKER=${DOCKER:-docker}
|
||||
-e RS3_DATA_DIR=/var/lib/rs3/data \
|
||||
-e RS3_ACCESS_KEY=sigma \
|
||||
-e RS3_SECRET_KEY=sigma-sigma \
|
||||
-e RS3_ENDPOINT=http://127.0.0.1:9000 \
|
||||
--rm -d \
|
||||
--entrypoint "" \
|
||||
--health-cmd 'curl --fail "http://127.0.0.1:${RS3_PORT}/readyz" || exit 1' \
|
||||
|
||||
@@ -133,7 +133,6 @@ services:
|
||||
RS3_DATA_DIR: /var/lib/rs3/data
|
||||
RS3_ACCESS_KEY: ${USERNAME}
|
||||
RS3_SECRET_KEY: ${PASSWORD}
|
||||
RS3_ENDPOINT: http://127.0.0.1:9000
|
||||
entrypoint:
|
||||
- /bin/sh
|
||||
- -c
|
||||
@@ -141,10 +140,11 @@ services:
|
||||
volumes:
|
||||
- ${VOLUME_PREFIX}/rs3:/var/lib/rs3/data
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "rs3-cli ls s3://sigma >/dev/null 2>&1"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
test: ["CMD-SHELL", "curl --fail http://127.0.0.1:$$RS3_PORT/readyz || exit 1"]
|
||||
interval: 30s
|
||||
timeout: 3s
|
||||
start_period: 5s
|
||||
retries: 3
|
||||
networks:
|
||||
- default
|
||||
labels:
|
||||
|
||||
Reference in new issue
Block a user