Updating docker file

.env.docker.sample

@@ -12,11 +12,13 @@ POSTGRES_MAIN_HOST=main_db
 POSTGRES_MAIN_PORT=5432
 DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:${POSTGRES_MAIN_PORT}/${POSTGRES_MAIN_DB}
 
+S3_BUCKET_NAME=soaricarus-bucket
+GARAGE_S3_REGION=maze
 GARAGE_RPC_SECRET=c2bde5c3f9c04116a7563e25ea5ba6fab25319daa2fe8a952ad57d0b8159b590
 GARAGE_METRICS_TOKEN=sD2g4jiYV66KdZWtIuj2amezuryzv81mZNktpMNcmU4=
 GARAGE_DEFAULT_ACCESS_KEY=GK8eb91557b9a18dcbdc834c16a25ac6fc
 GARAGE_DEFAULT_SECRET_KEY=WhFAtnAtWgYaa0pMfl9jwygalZSwYaVliY3Ndm7nYHo=
-GARAGE_DEFAULT_BUCKET=soaricarus-bucket
+GARAGE_DEFAULT_BUCKET=${S3_BUCKET_NAME}
 GARAGE_ADMIN_TOKEN=5yMAjSINa6U04wr4pDbcTYfsXKl3S9ZjKdiPXWYUbNw=
 GARAGE_METADATA_DIR=/var/lib/garage/meta
 GARAGE_DATA_DIR=/var/lib/garage/data
@@ -25,14 +27,7 @@ GARAGE_REPLICATION_FACTOR=1
 GARAGE_RPC_BIND_ADDR=[::]:3901
 GARAGE_S3_API_BIND_ADDR=[::]:3900
 GARAGE_S3_WEB_BIND_ADDR=[::]:3902
-GARAGE_S3_REGION=maze
 GARAGE_ROOT_DOMAIN=.localhost
-AWS_DEFAULT_REGION=maze
-AWS_SECRET_ACCESS_KEY=3o4n7yfo34985yrfcq9238765ry3928475rcy349857ty394578cy
-AWS_ACCESS_KEY_ID=2q39fnoy59q2347yfdrc327894ryfc0q2834rcyq023897
-
-S3_BUCKET_NAME=soaricarus-storage
-
-AWS_ENDPOINT=http://garage:3900
-AWS_REGION=garage
-GARAGE_BUCKET=soaricarus-data
+AWS_DEFAULT_REGION=${GARAGE_S3_REGION}
+AWS_SECRET_ACCESS_KEY=${GARAGE_DEFAULT_ACCESS_KEY}
+AWS_ACCESS_KEY_ID=${GARAGE_DEFAULT_SECRET_KEY}

.env.local.sample

@@ -11,3 +11,23 @@ POSTGRES_MAIN_DB=soaricarus_db
 POSTGRES_MAIN_HOST=main_db
 POSTGRES_MAIN_PORT=5432
 DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:${POSTGRES_MAIN_PORT}/${POSTGRES_MAIN_DB}
+
+S3_BUCKET_NAME=soaricarus-bucket
+GARAGE_S3_REGION=maze
+GARAGE_RPC_SECRET=c2bde5c3f9c04116a7563e25ea5ba6fab25319daa2fe8a952ad57d0b8159b590
+GARAGE_METRICS_TOKEN=sD2g4jiYV66KdZWtIuj2amezuryzv81mZNktpMNcmU4=
+GARAGE_DEFAULT_ACCESS_KEY=GK8eb91557b9a18dcbdc834c16a25ac6fc
+GARAGE_DEFAULT_SECRET_KEY=WhFAtnAtWgYaa0pMfl9jwygalZSwYaVliY3Ndm7nYHo=
+GARAGE_DEFAULT_BUCKET=${S3_BUCKET_NAME}
+GARAGE_ADMIN_TOKEN=5yMAjSINa6U04wr4pDbcTYfsXKl3S9ZjKdiPXWYUbNw=
+GARAGE_METADATA_DIR=/var/lib/garage/meta
+GARAGE_DATA_DIR=/var/lib/garage/data
+GARAGE_DB_ENGINE=sqlite
+GARAGE_REPLICATION_FACTOR=1
+GARAGE_RPC_BIND_ADDR=[::]:3901
+GARAGE_S3_API_BIND_ADDR=[::]:3900
+GARAGE_S3_WEB_BIND_ADDR=[::]:3902
+GARAGE_ROOT_DOMAIN=.localhost
+AWS_DEFAULT_REGION=${GARAGE_S3_REGION}
+AWS_SECRET_ACCESS_KEY=${GARAGE_DEFAULT_ACCESS_KEY}
+AWS_ACCESS_KEY_ID=${GARAGE_DEFAULT_SECRET_KEY}

docker-compose.yaml

@@ -16,6 +16,10 @@ services:
     depends_on:
       main_db:
         condition: service_healthy
+      maze:
+        condition: service_started
+      auth_api:
+        condition: service_started
     networks:
       - soaricarus-network
     restart: unless-stopped
@@ -56,13 +60,14 @@ services:
 #      - main_db
 #      - auth_api
 #      - auth_db
+#      - maze
 #    networks:
 #      - soaricarus-network
 
   # --- storage service ---
-  garage:
+  maze:
     image: dxflrs/garage:v2.3.0  # Use official Garage image
-    container_name: garage
+    container_name: maze
     restart: unless-stopped
     environment:
       # Garage configuration via environment variables
@@ -71,7 +76,7 @@ services:
       GARAGE_S3_API_BIND_ADDR: "0.0.0.0:3900"
       GARAGE_S3_API_PUBLIC_BIND_ADDR: "0.0.0.0:3901"
       GARAGE_S3_API_PUBLIC_ADDRS: "http://localhost:3901"
-      GARAGE_S3_API_ROOT_DOMAIN: "garage.local"
+      GARAGE_S3_API_ROOT_DOMAIN: "${GARAGE_ROOT_DOMAIN}"
       GARAGE_ADMIN_BIND_ADDR: "0.0.0.0:3902"
       GARAGE_ADMIN_PUBLIC_BIND_ADDR: "0.0.0.0:3902"
       
@@ -84,17 +89,18 @@ services:
       GARAGE_METADATA_DIR: "/data/meta"
       
       # RPC configuration
-      GARAGE_RPC_PUBLIC_ADDR: "http://garage:3901"
+      GARAGE_RPC_PUBLIC_ADDR: "http://maze:3901"
       GARAGE_RPC_BIND_ADDR: "0.0.0.0:3901"
       GARAGE_RPC_SECRET: "${GARAGE_RPC_SECRET}"  # 32+ chars
       
       # Web Admin
-      GARAGE_ADMIN_TOKEN: "${GARAGE_ADMIN_TOKEN:-garage-admin-token}"
+      GARAGE_ADMIN_TOKEN: "${GARAGE_ADMIN_TOKEN}"
       
       # Logging
       GARAGE_LOG_LEVEL: "info"
 
-      GARAGE_S3_BUCKET: "${S3_BUCKET_NAME}:-soaricarus-storage"
+      GARAGE_S3_BUCKET: "${S3_BUCKET_NAME}"
+
       GARAGE_DEFAULT_ACCESS_KEY: "${GARAGE_DEFAULT_ACCESS_KEY}"
       GARAGE_DEFAULT_SECRET_KEY: "${GARAGE_DEFAULT_SECRET_KEY}"
       GARAGE_DEFAULT_BUCKET: "${GARAGE_DEFAULT_BUCKET}"