From 570e047205b9dcc12a3ba18a7ef3ac0ef904fc16 Mon Sep 17 00:00:00 2001
From: Tianyong Qiu <tianyongq@mathmast.com>
Date: Tue, 25 Feb 2025 09:59:19 +0800
Subject: [PATCH] update for merge master docker-compose.dev.arm64.new.yaml

---
 .../cli/docker-compose.dev.arm64.new.yaml     | 80 ++++++++-----------
 1 file changed, 34 insertions(+), 46 deletions(-)

diff --git a/devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml b/devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml
index 7c2861e..f5f74ea 100644
--- a/devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml
+++ b/devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml
@@ -15,51 +15,6 @@ services:
     networks:
       - devbox_freeleaps2-network
 
-  chat:
-    container_name: freeleaps-chat
-    build:
-      context: ${WORKING_HOME}/freeleaps/apps
-      dockerfile: ${WORKING_HOME}/freeleaps/dockers/dev.chat.Dockerfile
-      args:
-        CONTAINER_APP_ROOT: app
-    restart: always
-    ports:
-      - 8012:8012
-    environment:
-      - CERT_PATH=/app/certs
-      - EMAIL_FROM=freeleaps@freeleaps.com
-      - MONGODB_NAME=freeleaps2
-      - MONGODB_URI=mongodb://freeleaps2-mongodb:27017/
-      - SITE_URL_ROOT=http://localhost
-      - JWT_SECRET_KEY=8f87ca8c3c9c3df09a9c78e0adb0927855568f6072d9efc892534aee35f5867b
-      - JWT_ALGORITHM=HS256
-      - RABBITMQ_HOST=freeleaps2-rabbitmq
-      - RABBITMQ_PORT=5672
-      - LOG_BASE_PATH=/app/log/freeleaps-chat
-      - BACKEND_LOG_FILE_NAME=freeleaps-chat.log
-      - APPLICATION_ACTIVITY_LOG=freeleaps-chat.application.log
-      - FREELEAPS_ENV=dev
-      - FREELEAPS_CHAT_ENDPOINT=http://freeleaps-alpha.com/api/chat/
-      - FREELEAPS_DEVSVC_ENDPOINT=http://devsvc:8007/api/devsvc/
-      - FREELEAPS_CONTENT_ENDPOINT=http://content:8013/api/content/
-      - FREELEAPS_NOTIFICATION_ENDPOINT=http://notification:8003/api/notification/
-      - FREELEAPS_CENTRAL_STORAGE_ENDPOINT=http://central_storage:8005/api/central_storage/
-      - FREELEAPS_AUTHENTICATION_ENDPOINT=http://authentication:8004/api/auth/
-      - CERT_PATH=/app/certs
-      - TZ=Asia/Shanghai
-    command:
-      # Use a conditional check for RabbitMQ in alpha profile
-      - /bin/sh
-      - -c
-      - |
-        uvicorn chat.main:app --reload --host=0.0.0.0 --port=8012 --workers 4 --timeout-keep-alive 120 --log-level info
-    volumes:
-      - type: bind
-        source: ${WORKING_HOME}/freeleaps/apps
-        target: /app/log/freeleaps-chat
-    networks:
-      - devbox_freeleaps2-network
-
   mongodb:
     # For apple chip, add: platform: linux/amd64
     # For apple chip, you may want to downgrade to public mongo:4.4 for log support
@@ -73,6 +28,7 @@ services:
       - ${WORKING_HOME}/freeleaps2-mongodb-data:/data/db
     networks:
       - devbox_freeleaps2-network
+    command: ["mongod", "--bind_ip_all"]
 
   rabbitmq:
     # For apple chip, add: platform: linux/amd64
@@ -254,7 +210,39 @@ services:
       - type: bind
         source: ${WORKING_HOME}/logs/notification
         target: /app/log/notification
-
+  payment:
+    container_name: payment
+    image: freeleaps/payment:latest-linux-arm64
+    restart: always
+    environment:
+      - APP_NAME=payment
+      - JWT_SECRET_KEY="8f87ca8c3c9c3df09a9c78e0adb0927855568f6072d9efc892534aee35f5867b"
+      - JWT_ALGORITHM="HS256" #site_settings
+      - SERVICE_API_ACCESS_HOST=localhost
+      - SERVICE_API_ACCESS_PORT=8006
+      - STRIPE_API_KEY=sk_test_51Ogsw5B0IyqaSJBrwczlr820jnmvA1qQQGoLZ2XxOsIzikpmXo4pRLjw4XVMTEBR8DdVTYySiAv1XX53Zv5xqynF00GfMqttFd
+      - STRIPE_WEBHOOK_SECRET=whsec_S6ZWjSAdR5Cpsn2USH6ZRBqbdBIENjTC
+      - STRIPE_ACCOUNT_WEBHOOK_SECRET=whsec_PgPnkWGhEUiQfnV8aIb5Wmruz7XETJLm
+      - MONGODB_NAME=freeleaps2
+      - MONGODB_PORT=27017
+      - MONGODB_URI=mongodb://freeleaps2-mongodb:27017/
+      - LOG_BASE_PATH=/app/log/payment
+      - BACKEND_LOG_FILE_NAME=payment.log
+      - SITE_URL_ROOT=http://localhost/
+      - APPLICATION_ACTIVITY_LOG=payment-application.log
+    ports:
+      - 8006:8006
+    command:
+      - /bin/sh
+      - -c
+      - |
+        uvicorn webapi.main:app --reload --port=8006 --host=0.0.0.0
+    networks:
+      - devbox_freeleaps2-network
+    volumes:
+      - type: bind
+        source: /var/lib/docker/app/payment/log
+        target: /app/log/payment
 volumes:
   freeleaps2-mongodb-data:
   freeleaps2-gitea-data: