Saving changes. No real progress yet
soaricarus_api CI / Test Suite (pull_request) Successful in 3m36s
soaricarus_api CI / Check (pull_request) Successful in 4m3s
soaricarus_api CI / Rustfmt (pull_request) Successful in 5m49s
soaricarus_api CI / Clippy (pull_request) Successful in 2m24s
soaricarus_api CI / build (pull_request) Successful in 4m32s
soaricarus_api CI / Test Suite (pull_request) Successful in 3m36s
soaricarus_api CI / Check (pull_request) Successful in 4m3s
soaricarus_api CI / Rustfmt (pull_request) Successful in 5m49s
soaricarus_api CI / Clippy (pull_request) Successful in 2m24s
soaricarus_api CI / build (pull_request) Successful in 4m32s
This commit is contained in:
+16
-25
@@ -11,6 +11,8 @@ services:
|
||||
- "8000:8000"
|
||||
env_file:
|
||||
- .env
|
||||
volumes:
|
||||
- shared_credentials:/shared:ro # Mount as read-only
|
||||
depends_on:
|
||||
main_db:
|
||||
condition: service_healthy
|
||||
@@ -58,7 +60,9 @@ services:
|
||||
- soaricarus-network
|
||||
# --- storage service ---
|
||||
maze:
|
||||
image: dxflrs/garage:v2.3.0
|
||||
build:
|
||||
context: ./garage
|
||||
dockerfile: Dockerfile
|
||||
container_name: maze
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
@@ -68,11 +72,20 @@ services:
|
||||
- "3903:3903" # Admin API
|
||||
volumes:
|
||||
- ./garage.toml:/etc/garage.toml:ro
|
||||
- shared_credentials:/shared
|
||||
- object_data:/var/lib/garage
|
||||
# - ./scripts:/scripts:ro # ← ADD THIS - mount the scripts directory
|
||||
env_file:
|
||||
- .env
|
||||
environment:
|
||||
- AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
|
||||
- AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
|
||||
- GARAGE_RPC_SECRET=${GARAGE_RPC_SECRET}
|
||||
- BUCKET_NAME=${S3_BUCKET_NAME}
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "curl -f http://localhost:3901/v0/status || exit 1"]
|
||||
# test: ["CMD-SHELL", "echo 'What is to be done?'"]
|
||||
# test: ["CMD-SHELL", "nc -z localhost 3900 || exit 1"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
@@ -80,30 +93,6 @@ services:
|
||||
networks:
|
||||
- soaricarus-network
|
||||
|
||||
# --- Storage Initialization ---
|
||||
maze-init:
|
||||
# image: dxflrs/garage:v2.3.0
|
||||
image: docker:dind
|
||||
container_name: maze-init
|
||||
depends_on:
|
||||
maze:
|
||||
condition: service_started
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock # Mount Docker socket
|
||||
- object_data:/var/lib/garage
|
||||
- ./scripts:/scripts:ro # ← ADD THIS - mount the scripts directory
|
||||
environment:
|
||||
- AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
|
||||
- AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
|
||||
- GARAGE_RPC_SECRET=${GARAGE_RPC_SECRET}
|
||||
- BUCKET_NAME=${S3_BUCKET_NAME}
|
||||
env_file:
|
||||
- .env
|
||||
entrypoint: ["/bin/sh"]
|
||||
command: ["/scripts/init-garage.sh"]
|
||||
restart: "no" # Run once and exit
|
||||
networks:
|
||||
- soaricarus-network
|
||||
|
||||
# PostgreSQL Database Service
|
||||
main_db:
|
||||
@@ -162,6 +151,8 @@ volumes:
|
||||
driver: local # Use the default local driver
|
||||
object_data:
|
||||
driver: local # Use the default local driver
|
||||
shared_credentials: # New shared volume
|
||||
driver: local
|
||||
|
||||
networks:
|
||||
soaricarus-network:
|
||||
|
||||
Reference in New Issue
Block a user