ci: Updated workflow

This reverts commit 7a209eeb5e.

.env.docker.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}

.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}

.github/workflows/workflow.yml

@@ -35,6 +35,7 @@ jobs:
   test:
     name: Test Suite
     runs-on: ubuntu-24.04
+    timeout-minutes: 20
     services:
       postgres:
         image: postgres:18.4-alpine
@@ -48,6 +49,21 @@ jobs:
           --health-timeout 5s
           --health-retries 5
 
+      localstack:
+        image: localstack/localstack:latest
+        env:
+          SERVICES: s3
+          AWS_ACCESS_KEY_ID: ${{ secrets.GARAGE_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.GARAGE_SECRET }}
+          AWS_DEFAULT_REGION: ${{ secrets.GARAGE_REGION }}
+        options: >-
+          --health-cmd "curl -f http://localhost:4566/_localstack/health || exit 1"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 3900:3900
+
     steps:
       - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -65,6 +81,7 @@ jobs:
           echo "Checking Docker Daemon Status (ps):"
           docker ps -a
           echo "Docker environment check complete."
+
       - name: Run tests
         env:
           # Define DATABASE_URL for tests to use
@@ -73,6 +90,9 @@ jobs:
           SECRET_MAIN_KEY: ${{ secrets.TOKEN_SECRET_KEY }}
           SSH_AUTH_SOCK: ${{ env.SSH_AUTH_SOCK }}
           ROOT_DIRECTORY: "/tmp"
+          AWS_ACCESS_KEY_ID: ${{ secrets.GARAGE_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.GARAGE_SECRET }}
+          AWS_DEFAULT_REGION: ${{ secrets.GARAGE_REGION }}
         run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/soaricarus_models_deploy_key

docker-compose.yaml

@@ -6,14 +6,20 @@ services:
     build:
       context: .
       ssh: ["default"]
-    container_name: soaricarus
+    container_name: api
     ports:
       - "8000:8000"
     env_file:
       - .env
+    volumes:
+      - shared_credentials:/shared:ro  # Mount as read-only 
     depends_on:
       main_db:
         condition: service_healthy
+      maze:
+        condition: service_started
+      auth_api:
+        condition: service_started
     networks:
       - soaricarus-network
     restart: unless-stopped
@@ -54,9 +60,70 @@ services:
       - main_db
       - auth_api
       - auth_db
+      - maze
     networks:
       - soaricarus-network
 
+  # --- storage service ---
+  maze:
+    image: dxflrs/garage:v2.3.0  # Use official Garage image
+    container_name: maze
+    restart: unless-stopped
+    environment:
+      # 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_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_ROOT_DOMAIN}"
+      GARAGE_ADMIN_BIND_ADDR: "0.0.0.0:3902"
+      GARAGE_ADMIN_PUBLIC_BIND_ADDR: "0.0.0.0:3902"
+      
+      # Cluster configuration (single node for simplicity)
+      GARAGE_CLUSTER_REPLICATION_MODE: "none"  # Single node
+      GARAGE_CLUSTER_PEER_REPLICATION_STRATEGY: "ring"
+      
+      # Data storage
+      GARAGE_DATA_DIR: "/data"
+      GARAGE_METADATA_DIR: "/data/meta"
+      
+      # RPC configuration
+      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}"
+      
+      # Logging
+      GARAGE_LOG_LEVEL: "info"
+
+      GARAGE_S3_BUCKET: "${S3_BUCKET_NAME}"
+      GARAGE_S3_REGION: "${GARAGE_S3_REGION}"
+
+      GARAGE_DEFAULT_ACCESS_KEY: "${GARAGE_DEFAULT_ACCESS_KEY}"
+      GARAGE_DEFAULT_SECRET_KEY: "${GARAGE_DEFAULT_SECRET_KEY}"
+      GARAGE_DEFAULT_BUCKET: "${GARAGE_DEFAULT_BUCKET}"
+      
+    volumes:
+      - ./garage.toml:/etc/garage.toml:ro  # Mount config file
+      - shared_credentials:/data  # Persist Garage data
+    ports:
+      - "3900:3900"  # S3 API
+      - "3901:3901"  # S3 API public
+      - "3902:3902"  # Admin API
+    command: ["/garage", "server", "--single-node", "--default-bucket"]
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3900/"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 10s
+    networks:
+      - soaricarus-network
+    extra_hosts:
+      - "garage.local:127.0.0.1"
 
   # PostgreSQL Database Service
   main_db:
@@ -113,6 +180,10 @@ volumes:
     driver: local # Use the default local driver
   postgres_data_auth:
     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:

garage.toml

@@ -0,0 +1,24 @@
+metadata_dir = "/var/lib/garage/meta"
+data_dir = "/var/lib/garage/data"
+db_engine = "sqlite"
+
+replication_factor = 1
+rpc_public_addr = "127.0.0.1:3901"
+rpc_secret = "${GARAGE_RPC_SECRET}"
+
+rpc_bind_addr = "[::]:3901"
+
+[s3_api]
+s3_region = "maze"
+api_bind_addr = "[::]:3900"
+root_domain = ".s3.maze.localhost"
+
+[s3_web]
+bind_addr = "[::]:3902"
+root_domain = ".web.maze.localhost"
+index = "index.html"
+
+[admin]
+api_bind_addr = "[::]:3903"
+admin_token = "${GARAGE_ADMIN_TOKEN}"
+metrics_token = "${GARAGE_METRICS_TOKEN}"