Merge branch 'main' of https://github.com/izadoesdev/mono

Author: Hyteq

dashboard.Dockerfile

@@ -31,17 +31,22 @@ RUN bun run build
 FROM oven/bun:1-slim
 
 # Copy built files from builder
-COPY --from=builder /build/apps/dashboard /app
 WORKDIR /app
 
+COPY --from=builder /build/node_modules ./node_modules
+COPY --from=builder /build/apps/dashboard ./apps/dashboard
+COPY --from=builder /build/packages ./packages
+
 # Set environment variables
 ENV NODE_ENV=production 
 ENV REDIS_URL=redis://localhost
 ENV DATABASE_URL=postgres://localhost
 ENV CLICKHOUSE_URL=https://localhost
 ENV NEXT_PUBLIC_API_URL=https://localhost
-
+ENV HOSTNAME=0.0.0.0
 # Expose port
 EXPOSE 3000
+
+WORKDIR /app/apps/dashboard
 # Start API
 CMD ["bun", "run", "start"]

infrastructure/deploy/deploy-databuddy.yaml

@@ -7,7 +7,7 @@
   vars:
     working_dir_name: "databuddy-app"
     version: "{{version | default('latest')}}"
-    api_host: beta-api.databyddy.cc
+    api_host: beta-api.databuddy.cc
     basket_host: beta-basket.databuddy.cc
     dashboard_host: beta-app.databuddy.cc
 

infrastructure/deploy/docker-compose.yaml

@@ -5,7 +5,7 @@ x-databuddy-env:
     REDIS_URL: "redis://redis:6379"
     QUEUE_REDIS_URL: "redis://redis:6379"
     AI_API_KEY: "{{ai_api_key}}" # secret
-    BETTER_AUTH_SECRET: "{{better_auth_secret | regex_replace('\\$', '\\$\\$')}}" # secret
+    BETTER_AUTH_SECRET: "{{better_auth_secret | regex_replace('\\$', '$$')}}" # secret
     BETTER_AUTH_URL: "{{better_auth_url}}" 
     GITHUB_CLIENT_ID: "{{github_client_id}}"
     GITHUB_CLIENT_SECRET: "{{github_client_secret}}"  # secret
@@ -24,6 +24,14 @@ services:
     environment: *databuddy-env
     deploy:
       mode: global
+      update_config:
+        parallelism: 1
+        order: stop-first
+        failure_action: rollback
+        delay: 60s
+      rollback_config:
+        parallelism: 1
+        order: stop-first
       placement:
         constraints:
           - node.labels.app==true
@@ -36,12 +44,22 @@ services:
     networks:
       - databuddy_ingress
       - databuddy_aqua
+    expose:
+      - 3000
 
   dashboard:
     image: "registry.databuddy.cc/dashboard:{{version}}"
     environment: *databuddy-env
     deploy:
       mode: global
+      update_config:
+        parallelism: 1
+        order: stop-first
+        failure_action: rollback
+        delay: 60s
+      rollback_config:
+        parallelism: 1
+        order: stop-first
       placement:
         constraints:
           - node.labels.app==true
@@ -54,12 +72,22 @@ services:
     networks:
       - databuddy_ingress
       - databuddy_aqua
+    expose:
+      - 3000
 
   basket:
     image: "registry.databuddy.cc/basket:{{version}}"
     environment: *databuddy-env
     deploy:
       mode: global
+      update_config:
+        parallelism: 1
+        order: stop-first
+        failure_action: rollback
+        delay: 60s
+      rollback_config:
+        parallelism: 1
+        order: stop-first
       placement:
         constraints:
           - node.labels.app==true
@@ -72,6 +100,8 @@ services:
     networks:
       - databuddy_ingress
       - databuddy_aqua
+    expose:
+      - 3000
 
 networks:
   databuddy_ingress: