diff --git a/docker/bisheng/config/config_dev.yaml b/docker/bisheng/config/config_dev.yaml index 9ca8b8a6c..b820e1954 100644 --- a/docker/bisheng/config/config_dev.yaml +++ b/docker/bisheng/config/config_dev.yaml @@ -28,7 +28,7 @@ # secret_key: minioadmin # 数据库配置database_url: "mysql+pymysql://root:1234@mysql:3306/bisheng?charset=utf8mb4"database_url: "mysql+pymysql://root:1234@mysql:3306/bisheng?charset=utf8mb4" -database_url: "mysql+pymysql://root:gAAAAABlsc05yYeNuwuU_m2g7sGMMq2y2jPA72SaUnR05KFPz9uSawL82EXC3tgyFVl_Zp8kEPrfV-eB2SRyk1P_F4JbaXiGDg==@mysql:3306/bisheng?charset=utf8mb4" +database_url: "mysql+pymysql://root:gAAAAABlp4b4c59FeVGF_OQRVf6NOUIGdxq8246EBD-b0hdK_jVKRs1x4PoAn0A6C5S6IiFKmWn0Nm5eBUWu-7jxcqw6TiVjQA==@192.168.106.171:3306/bisheng?charset=utf8mb4" #database_url: "mysql+pymysql://root:1234@192.168.106.125:3306/bisheng" #database_url: "mysql+pymysql://root:gAAAAABlp5vQN7g85IfoeK8nLCb9cfVqpy9ZK9kN7b0qbAXZ4NOZT_Ef7stKJBY6PjL0dngQnCvQMdsavuGu-EE2o6Zlvv6l-Frye08DBXRR4WmL7y7EfK4=@192.168.106.116:3306/langflow?charset=utf8mb4" redis_url: "redis://192.168.106.171:6379/11" diff --git a/docker/docker-compose-dev.yml b/docker/docker-compose-dev.yml index 48e694d52..bc3fae464 100644 --- a/docker/docker-compose-dev.yml +++ b/docker/docker-compose-dev.yml @@ -1,24 +1,4 @@ services: - mysql: - container_name: bisheng-mysql - image: mysql:8.0 - - ports: - - "3307:3306" - environment: - MYSQL_ROOT_PASSWORD: "1234" # 数据库密码,如果修改需要同步修改bisheng/congfig/config.yaml配置database_url的mysql连接密码 - MYSQL_DATABASE: bisheng - TZ: Asia/Shanghai - volumes: - - ${DOCKER_VOLUME_DIRECTORY:-.}/mysql/conf/my.cnf:/etc/mysql/my.cnf - - ${DOCKER_VOLUME_DIRECTORY:-.}/mysql/data:/var/lib/mysql - healthcheck: - test: ["CMD-SHELL", "mysql -u root -p$$MYSQL_ROOT_PASSWORD -e 'CREATE DATABASE IF NOT EXISTS openfga;'"] - start_period: 30s - interval: 20s - timeout: 10s - retries: 4 - restart: on-failure backend: container_name: bisheng-backend @@ -58,9 +38,6 @@ services: interval: 90s timeout: 30s retries: 3 - depends_on: - mysql: - condition: service_healthy frontend: container_name: bisheng-frontend