fix: update staging setting to follow prod pattern

Author: Bulletdev

docker-compose.staging.yml

@@ -25,72 +25,88 @@ services:
     restart: unless-stopped
     networks:
       - coolify
-    environment:
-      RAILS_ENV: production
-      DATABASE_URL: ${DATABASE_URL}
-      REDIS_URL: redis://default:${REDIS_PASSWORD}@redis:6379/0
-      ELASTICSEARCH_URL: ${ELASTICSEARCH_URL:-http://elastic:9200}
-      RAILS_LOG_TO_STDOUT: "true"
-      PORT: 3000
-      RAILS_MASTER_KEY: ${RAILS_MASTER_KEY}
-      RIOT_API_KEY: ${RIOT_API_KEY}
-      CORS_ORIGINS: ${CORS_ORIGINS:-https://prostaff.gg,https://www.prostaff.gg,https://api.prostaff.gg}
-      JWT_SECRET_KEY: ${JWT_SECRET_KEY}
-      SECRET_KEY_BASE: ${SECRET_KEY_BASE}
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:3000/up || exit 1"]
-      interval: 10s
-      timeout: 3s
-      retries: 3
-      start_period: 40s
-    depends_on:
-      redis:
-        condition: service_healthy
+    expose:
+      - "3000"
     labels:
+      # Coolify Meta
       - coolify.managed=true
       - coolify.applicationId=1
       - coolify.type=application
-      # Traefik routing
+
+      # Traefik Configuration - Main Router (HTTPS)
       - traefik.enable=true
       - traefik.http.routers.prostaff-api.rule=Host(`api.prostaff.gg`)
-      - traefik.http.routers.prostaff-api.entrypoints=websecure
+      - traefik.http.routers.prostaff-api.entrypoints=https
       - traefik.http.routers.prostaff-api.tls=true
       - traefik.http.routers.prostaff-api.tls.certresolver=letsencrypt
-      # Service configuration
+      # Apply CORS middleware to the main router
+      - traefik.http.routers.prostaff-api.middlewares=prostaff-cors
+
+      # Service Configuration (Port 3000)
       - traefik.http.services.prostaff-api.loadbalancer.server.port=3000
-      - traefik.http.services.prostaff-api.loadbalancer.healthcheck.path=/up
-      - traefik.http.services.prostaff-api.loadbalancer.healthcheck.interval=10s
-      - traefik.http.services.prostaff-api.loadbalancer.healthcheck.timeout=3s
-      # HTTP to HTTPS redirect
+
+      # HTTP to HTTPS Redirect
       - traefik.http.routers.prostaff-api-http.rule=Host(`api.prostaff.gg`)
-      - traefik.http.routers.prostaff-api-http.entrypoints=web
+      - traefik.http.routers.prostaff-api-http.entrypoints=http
       - traefik.http.routers.prostaff-api-http.middlewares=redirect-to-https
       - traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https
-      # CORS middleware
+
+      # CORS Middleware Definition
       - traefik.http.middlewares.prostaff-cors.headers.accesscontrolallowmethods=GET,POST,PUT,PATCH,DELETE,OPTIONS,HEAD
       - traefik.http.middlewares.prostaff-cors.headers.accesscontrolalloworiginlist=https://prostaff.gg,https://www.prostaff.gg
       - traefik.http.middlewares.prostaff-cors.headers.accesscontrolallowcredentials=true
-      - traefik.http.middlewares.prostaff-cors.headers.accesscontrolallowheaders=*
+      - traefik.http.middlewares.prostaff-cors.headers.accesscontrolallowheaders=Authorization,Content-Type,Accept,Origin,X-Requested-With
       - traefik.http.middlewares.prostaff-cors.headers.accesscontrolmaxage=86400
-      # Apply middleware
-      - traefik.http.routers.prostaff-api.middlewares=prostaff-cors
+
+      # Network configuration for Traefik
+      - traefik.docker.network=coolify
+
+      # Explicitly set service name for Traefik
+      - traefik.http.services.prostaff-api.loadbalancer.server.scheme=http
+
+    environment:
+      RAILS_ENV: production
+      DATABASE_URL: '${DATABASE_URL}'
+      # Connect to Redis via Docker network hostname
+      REDIS_URL: 'redis://default:${REDIS_PASSWORD}@redis:6379/0'
+      ELASTICSEARCH_URL: '${ELASTICSEARCH_URL:-http://elastic:9200}'
+      RAILS_LOG_TO_STDOUT: 'true'
+      PORT: 3000
+      RAILS_MASTER_KEY: '${RAILS_MASTER_KEY}'
+      RIOT_API_KEY: '${RIOT_API_KEY}'
+      CORS_ORIGINS: '${CORS_ORIGINS:-https://prostaff.gg,https://www.prostaff.gg,https://api.prostaff.gg}'
+      JWT_SECRET_KEY: '${JWT_SECRET_KEY}'
+      SECRET_KEY_BASE: '${SECRET_KEY_BASE}'
+
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - 'curl -f http://localhost:3000/up || exit 1'
+      interval: 10s
+      timeout: 10s
+      retries: 3
+      start_period: 60s
+
+    depends_on:
+      redis:
+        condition: service_healthy
 
   sidekiq:
     build:
       context: .
       dockerfile: Dockerfile.production
-    command: bundle exec sidekiq -C config/sidekiq.yml
+    command: 'bundle exec sidekiq -C config/sidekiq.yml'
     restart: unless-stopped
     networks:
       - coolify
     environment:
       RAILS_ENV: production
-      DATABASE_URL: ${DATABASE_URL}
-      REDIS_URL: redis://default:${REDIS_PASSWORD}@redis:6379/0
-      ELASTICSEARCH_URL: ${ELASTICSEARCH_URL:-http://elastic:9200}
-      RAILS_MASTER_KEY: ${RAILS_MASTER_KEY}
-      RIOT_API_KEY: ${RIOT_API_KEY}
-      SECRET_KEY_BASE: ${SECRET_KEY_BASE}
+      DATABASE_URL: '${DATABASE_URL}'
+      REDIS_URL: 'redis://default:${REDIS_PASSWORD}@redis:6379/0'
+      ELASTICSEARCH_URL: '${ELASTICSEARCH_URL:-http://elastic:9200}'
+      RAILS_MASTER_KEY: '${RAILS_MASTER_KEY}'
+      RIOT_API_KEY: '${RIOT_API_KEY}'
+      SECRET_KEY_BASE: '${SECRET_KEY_BASE}'
     depends_on:
       redis:
         condition: service_healthy