diff --git a/docker-compose.yaml b/docker-compose.yaml index 16afc13..8991797 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -68,7 +68,6 @@ services: # Garage configuration via environment variables GARAGE_SERVER_BIND_ADDR: "0.0.0.0:3900" GARAGE_SERVER_BIND_PUBLIC_ADDR: "0.0.0.0:3901" - GARAGE_S3_API_S3_REGION: "garage" 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" @@ -87,7 +86,7 @@ services: # RPC configuration GARAGE_RPC_PUBLIC_ADDR: "http://garage:3901" GARAGE_RPC_BIND_ADDR: "0.0.0.0:3901" - GARAGE_RPC_SECRET: "${GARAGE_RPC_SECRET:-changeme12345678901234567890123456789012}" # 32+ chars + GARAGE_RPC_SECRET: "${GARAGE_RPC_SECRET}" # 32+ chars # Web Admin GARAGE_ADMIN_TOKEN: "${GARAGE_ADMIN_TOKEN:-garage-admin-token}" @@ -96,6 +95,9 @@ services: GARAGE_LOG_LEVEL: "info" GARAGE_S3_BUCKET: "${S3_BUCKET_NAME}:-soaricarus-storage" + GARAGE_DEFAULT_ACCESS_KEY: "${GARAGE_DEFAULT_ACCESS_KEY}" + GARAGE_DEFAULT_SECRET_KEY: "${GARAGE_DEFAULT_SECRET_KEY}" + GARAGE_DEFAULT_BUCKET: "${GARAGE_DEFAULT_BUCKET}" volumes: # - garage_data:/data # Persist Garage data @@ -110,7 +112,8 @@ services: # - | # ls / # /garage -c /etc/garage.toml server - command: ["/garage", "-c", "/etc/garage.toml", "server"] + # command: ["/garage", "-c", "/etc/garage.toml", "server"] + command: ["/garage", "server", "--single-node", "--default-bucket"] healthcheck: test: ["CMD", "curl", "-f", "http://localhost:3900/"] interval: 30s diff --git a/garage.toml b/garage.toml index 842a66b..f722d5b 100644 --- a/garage.toml +++ b/garage.toml @@ -4,7 +4,6 @@ db_engine = "sqlite" replication_factor = 1 rpc_public_addr = "127.0.0.1:3901" -rpc_secret = "$(openssl rand -hex 32)" rpc_secret = "${GARAGE_RPC_SECRET}" rpc_bind_addr = "[::]:3901"