Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 1 deletion getting-started/assets/polaris/create-catalog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ PAYLOAD='{

echo $PAYLOAD

curl -s -H "Authorization: Bearer ${TOKEN}" \
curl --fail-with-body \
-s \
-H "Authorization: Bearer ${TOKEN}" \
-H 'Accept: application/json' \
-H 'Content-Type: application/json' \
-H "Polaris-Realm: $realm" \
Expand Down
5 changes: 4 additions & 1 deletion getting-started/assets/polaris/obtain-token.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ apk add --no-cache jq

realm=${1:-"POLARIS"}

TOKEN=$(curl -s http://polaris:8181/api/catalog/v1/oauth/tokens \
TOKEN=$(curl \
--fail-with-body \
-s \
http://polaris:8181/api/catalog/v1/oauth/tokens \
--user ${CLIENT_ID}:${CLIENT_SECRET} \
-H "Polaris-Realm: $realm" \
-d grant_type=client_credentials \
Expand Down
4 changes: 2 additions & 2 deletions getting-started/ceph/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ services:
depends_on:
- osd1
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:7480"]
test: ["CMD", "curl", "--fail", "http://localhost:7480"]
interval: 2s
timeout: 10s
retries: 10
Expand Down Expand Up @@ -172,7 +172,7 @@ services:
polaris.realm-context.realms: POLARIS
quarkus.otel.sdk.disabled: "true"
healthcheck:
test: ["CMD", "curl", "http://localhost:8182/q/health"]
test: ["CMD", "curl", "--fail", "http://localhost:8182/q/health"]
interval: 2s
timeout: 10s
retries: 10
Expand Down
4 changes: 2 additions & 2 deletions getting-started/jdbc/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ services:
polaris.features."SUPPORTED_CATALOG_STORAGE_TYPES": "[\"FILE\",\"S3\",\"GCS\",\"AZURE\"]"
polaris.readiness.ignore-severe-issues: "true"
healthcheck:
test: ["CMD", "curl", "http://localhost:8182/q/health"]
test: ["CMD", "curl", "--fail", "http://localhost:8182/q/health"]
interval: 2s
timeout: 10s
retries: 10
Expand Down Expand Up @@ -76,7 +76,7 @@ services:
ports:
- "4040-4045:4040-4045"
healthcheck:
test: "curl localhost:4040"
test: ["CMD", "curl", "--fail", "http://localhost:4040"]
interval: 5s
retries: 15
command: [
Expand Down
2 changes: 1 addition & 1 deletion getting-started/keycloak/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ services:
polaris.features."SUPPORTED_CATALOG_STORAGE_TYPES": "[\"FILE\",\"S3\",\"GCS\",\"AZURE\"]"
polaris.readiness.ignore-severe-issues: "true"
healthcheck:
test: ["CMD", "curl", "http://localhost:8182/q/health"]
test: ["CMD", "curl", "--fail", "http://localhost:8182/q/health"]
interval: 2s
timeout: 10s
retries: 10
Expand Down
4 changes: 2 additions & 2 deletions getting-started/minio/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ services:
- "--console-address"
- ":9001"
healthcheck:
test: ["CMD", "curl", "http://127.0.0.1:9000/minio/health/live"]
test: ["CMD", "curl", "--fail", "http://127.0.0.1:9000/minio/health/live"]
interval: 1s
timeout: 10s

Expand All @@ -61,7 +61,7 @@ services:
polaris.realm-context.realms: POLARIS
quarkus.otel.sdk.disabled: "true"
healthcheck:
test: ["CMD", "curl", "http://localhost:8182/q/health"]
test: ["CMD", "curl", "--fail", "http://localhost:8182/q/health"]
interval: 2s
timeout: 10s
retries: 10
Expand Down
8 changes: 5 additions & 3 deletions getting-started/ozone/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ services:
ozone-datanode:
condition: service_started
healthcheck:
test: ["CMD", "curl", "http://localhost:9888"]
test: ["CMD", "curl", "--fail", "http://localhost:9888"]
interval: 1s
timeout: 10s
retries: 60
Expand All @@ -91,7 +91,9 @@ services:
<<: *ozone-common-config
WAITFOR: ozone-om:9874
healthcheck:
test: ["CMD", "curl", "http://localhost:9878"]
test: ["CMD", "curl", "--fail", "http://localhost:19878"]
# Should ideally use the following, but the curl version in ozone image is too old (7.76.1) to support --aws-sigv4
# test: ["CMD", "curl", "--fail", "--user", "root:s3cr3t", "--aws-sigv4", "aws:amz:us-west-1:s3", "http://localhost:9878"]
interval: 1s
timeout: 10s
retries: 60
Expand All @@ -118,7 +120,7 @@ services:
polaris.realm-context.realms: POLARIS
quarkus.otel.sdk.disabled: "true"
healthcheck:
test: ["CMD", "curl", "http://localhost:8182/q/health"]
test: ["CMD", "curl", "--fail", "http://localhost:8182/q/health"]
interval: 2s
timeout: 10s
retries: 60
Expand Down
4 changes: 2 additions & 2 deletions getting-started/quickstart/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ services:
RUSTFS_CONSOLE_ENABLE: "true"
RUSTFS_CONSOLE_ADDRESS: ":9001"
healthcheck:
test: ["CMD-SHELL", "curl -f http://127.0.0.1:9000/health && curl -f http://127.0.0.1:9001/rustfs/console/health"]
test: ["CMD-SHELL", "curl --fail http://127.0.0.1:9000/health && curl --fail http://127.0.0.1:9001/rustfs/console/health"]
interval: 30s
timeout: 10s
retries: 3
Expand Down Expand Up @@ -62,7 +62,7 @@ services:
polaris.realm-context.realms: ${POLARIS_REALM:-POLARIS}
quarkus.otel.sdk.disabled: "true"
healthcheck:
test: ["CMD", "curl", "http://localhost:8182/q/health"]
test: ["CMD", "curl", "--fail", "http://localhost:8182/q/health"]
interval: 2s
timeout: 10s
retries: 10
Expand Down
4 changes: 2 additions & 2 deletions getting-started/rustfs/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:
RUSTFS_CONSOLE_ENABLE: "true"
RUSTFS_CONSOLE_ADDRESS: ":9001"
healthcheck:
test: ["CMD-SHELL", "curl -f http://127.0.0.1:9000/health && curl -f http://127.0.0.1:9001/rustfs/console/health"]
test: ["CMD-SHELL", "curl --fail http://127.0.0.1:9000/health && curl --fail http://127.0.0.1:9001/rustfs/console/health"]
interval: 30s
timeout: 10s
retries: 3
Expand Down Expand Up @@ -60,7 +60,7 @@ services:
polaris.realm-context.realms: POLARIS
quarkus.otel.sdk.disabled: "true"
healthcheck:
test: ["CMD-SHELL", "curl -f http://localhost:8182/q/health"]
test: ["CMD", "curl", "--fail", "http://localhost:8182/q/health"]
interval: 2s
timeout: 10s
retries: 10
Expand Down
2 changes: 1 addition & 1 deletion getting-started/spark/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ services:
polaris.features."SUPPORTED_CATALOG_STORAGE_TYPES": "[\"FILE\",\"S3\",\"GCS\",\"AZURE\"]"
polaris.readiness.ignore-severe-issues: "true"
healthcheck:
test: ["CMD", "curl", "http://localhost:8182/healthcheck"]
test: ["CMD", "curl", "--fail", "http://localhost:8182/q/health"]
interval: 10s
timeout: 10s
retries: 5
Expand Down
2 changes: 1 addition & 1 deletion getting-started/telemetry/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ services:
quarkus.log.file.format: "%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{3.}] [%X{app},%X{env}] [%X{realmId},%X{requestId}] [%X{traceId},%X{spanId}] (%t) %s%e%n"
polaris.realm-context.realms: POLARIS
healthcheck:
test: ["CMD", "curl", "http://localhost:8182/q/health"]
test: ["CMD", "curl", "--fail", "http://localhost:8182/q/health"]
interval: 2s
timeout: 10s
retries: 10
Expand Down