Skip to content
Open
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
11 changes: 4 additions & 7 deletions dev/docker-compose-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,27 +62,24 @@ services:
- CATALOG_S3_ENDPOINT=http://object-store:9000
- CATALOG_JDBC_STRICT__MODE=true
object-store:
image: rustfs/rustfs:1.0.0
image: rustfs/rustfs:1.0.3
container_name: pyiceberg-object-store
networks:
iceberg_net:
aliases:
- warehouse.object-store
ports:
- 9001:9001
- 9000:9000
environment:
- RUSTFS_ACCESS_KEY=admin
- RUSTFS_SECRET_KEY=password
- RUSTFS_VOLUMES=/data
- RUSTFS_ADDRESS=:9000
- RUSTFS_CONSOLE_ENABLE=true
- RUSTFS_CONSOLE_ADDRESS=:9001

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

these are all defaults, can remove

- RUSTFS_OBS_LOG_STDOUT_ENABLED=true

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

show logs in CI

- RUSTFS_CONSOLE_ENABLE=false

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

removes console port 9001, we dont need it

# Resolves virtual-hosted-style `warehouse.object-store` to the warehouse
# bucket.
- RUSTFS_SERVER_DOMAINS=object-store
healthcheck:
test: ["CMD-SHELL", "curl --fail http://127.0.0.1:9000/health"]
test: ["CMD-SHELL", "curl --fail http://127.0.0.1:9000/health/ready"]

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The RustFS Status Check docs define the two endpoints differently:

  • /health is a liveness check. It returns 200 "as long as the process is up".

  • /health/ready is a readiness check. It returns 200 "only when storage, IAM, and peer health are ready", and 503 otherwise.

interval: 5s
timeout: 5s
retries: 10
Expand Down
11 changes: 4 additions & 7 deletions dev/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,17 @@

services:
object-store:
image: rustfs/rustfs:1.0.0
image: rustfs/rustfs:1.0.3
container_name: pyiceberg-object-store
ports:
- 9001:9001
- 9000:9000
environment:
- RUSTFS_ACCESS_KEY=admin
- RUSTFS_SECRET_KEY=password
- RUSTFS_VOLUMES=/data
- RUSTFS_ADDRESS=:9000
- RUSTFS_CONSOLE_ENABLE=true
- RUSTFS_CONSOLE_ADDRESS=:9001
- RUSTFS_OBS_LOG_STDOUT_ENABLED=true
- RUSTFS_CONSOLE_ENABLE=false
healthcheck:
test: ["CMD-SHELL", "curl --fail http://127.0.0.1:9000/health"]
test: ["CMD-SHELL", "curl --fail http://127.0.0.1:9000/health/ready"]
interval: 5s
timeout: 5s
retries: 10
Expand Down
Loading