Skip to content

Commit 7631955

Browse files
committed
chore: Update S3 configuration and health check commands
- Changed S3 access and secret keys in .env.example and test configuration to new values. - Updated Docker Compose files to reflect the new S3 access keys and added default bucket environment variable. - Modified health check command in Docker Compose to use the new status command for better service monitoring. - Added RPC settings in garage.toml for improved service configuration.
1 parent 64b4494 commit 7631955

5 files changed

Lines changed: 17 additions & 18 deletions

File tree

.env.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ REDIS_PORT=6379
3737

3838
# ── S3 Storage (Garage) ────────────────────────────────────────
3939
S3_ENDPOINT=localhost:3900
40-
S3_ACCESS_KEY=minioadmin
41-
S3_SECRET_KEY=minioadmin
40+
S3_ACCESS_KEY=GKminioadmin0000
41+
S3_SECRET_KEY=minioadminsecret
4242
# S3_SECURE=false
4343
# S3_BUCKET=code-interpreter-files
4444
# S3_REGION=garage

docker-compose.prod.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,19 @@ services:
6868
image: dxflrs/garage:v2.3.0
6969
container_name: code-interpreter-garage
7070
restart: unless-stopped
71-
command: >
72-
server
73-
--single-node
74-
--default-bucket ${S3_BUCKET:-code-interpreter-files}
71+
command: /garage server --single-node --default-bucket
7572
ports:
7673
- "127.0.0.1:${S3_PORT:-3900}:3900"
7774
- "127.0.0.1:${GARAGE_ADMIN_PORT:-3903}:3903"
7875
environment:
79-
GARAGE_DEFAULT_ACCESS_KEY: ${S3_ACCESS_KEY:-minioadmin}
80-
GARAGE_DEFAULT_SECRET_KEY: ${S3_SECRET_KEY:-minioadmin}
76+
GARAGE_DEFAULT_ACCESS_KEY: ${S3_ACCESS_KEY:-GKminioadmin0000}
77+
GARAGE_DEFAULT_SECRET_KEY: ${S3_SECRET_KEY:-minioadminsecret}
78+
GARAGE_DEFAULT_BUCKET: ${S3_BUCKET:-code-interpreter-files}
8179
volumes:
8280
- garage-data:/var/lib/garage
8381
- ./garage.toml:/etc/garage.toml
8482
healthcheck:
85-
test: ["CMD-SHELL", "curl -sf http://localhost:3900 || exit 1"]
83+
test: ["CMD", "/garage", "status"]
8684
interval: 10s
8785
timeout: 5s
8886
retries: 5

docker-compose.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,19 @@ services:
7070
image: dxflrs/garage:v2.3.0
7171
container_name: code-interpreter-garage
7272
restart: unless-stopped
73-
command: >
74-
server
75-
--single-node
76-
--default-bucket ${S3_BUCKET:-code-interpreter-files}
73+
command: /garage server --single-node --default-bucket
7774
ports:
7875
- "127.0.0.1:${S3_PORT:-3900}:3900"
7976
- "127.0.0.1:${GARAGE_ADMIN_PORT:-3903}:3903"
8077
environment:
81-
GARAGE_DEFAULT_ACCESS_KEY: ${S3_ACCESS_KEY:-minioadmin}
82-
GARAGE_DEFAULT_SECRET_KEY: ${S3_SECRET_KEY:-minioadmin}
78+
GARAGE_DEFAULT_ACCESS_KEY: ${S3_ACCESS_KEY:-GKminioadmin0000}
79+
GARAGE_DEFAULT_SECRET_KEY: ${S3_SECRET_KEY:-minioadminsecret}
80+
GARAGE_DEFAULT_BUCKET: ${S3_BUCKET:-code-interpreter-files}
8381
volumes:
8482
- garage-data:/var/lib/garage
8583
- ./garage.toml:/etc/garage.toml
8684
healthcheck:
87-
test: ["CMD-SHELL", "curl -sf http://localhost:3900 || exit 1"]
85+
test: ["CMD", "/garage", "status"]
8886
interval: 10s
8987
timeout: 5s
9088
retries: 5

garage.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ data_dir = "/var/lib/garage/data"
33
db_engine = "sqlite"
44
replication_factor = 1
55

6+
rpc_bind_addr = "[::]:3901"
7+
rpc_secret = "0000000000000000000000000000000000000000000000000000000000000000"
8+
69
[s3_api]
710
s3_region = "garage"
811
api_bind_addr = "[::]:3900"

tests/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
os.environ.setdefault("REDIS_HOST", "localhost")
1414
os.environ.setdefault("REDIS_PORT", "6379")
1515
os.environ.setdefault("S3_ENDPOINT", "localhost:3900")
16-
os.environ.setdefault("S3_ACCESS_KEY", "minioadmin")
17-
os.environ.setdefault("S3_SECRET_KEY", "minioadmin")
16+
os.environ.setdefault("S3_ACCESS_KEY", "GKminioadmin0000")
17+
os.environ.setdefault("S3_SECRET_KEY", "minioadminsecret")
1818
os.environ.setdefault("S3_SECURE", "false")
1919

2020
from src.services.session import SessionService

0 commit comments

Comments
 (0)