diff --git a/build_service.py b/build_service.py index a4150bc..9f9a8ed 100644 --- a/build_service.py +++ b/build_service.py @@ -173,13 +173,6 @@ def main(): ) print(f"已生成合并后的 docker-compose.yaml: {output_path}") - # 3. 启动docker-compose - stop_docker_compose(root_dir) - if not start_docker_compose(root_dir): - print("启动docker-compose失败") - return - - print("部署流程完成") print("\n===== 清理虚悬镜像 =====") if not cleanup_dangling_images(): print("清除虚悬镜像失败(非致命错误,继续部署流程)") diff --git a/deploy/.env b/deploy/.env new file mode 100644 index 0000000..21e982a --- /dev/null +++ b/deploy/.env @@ -0,0 +1,12 @@ +# 数据库配置 +DB_USER=postgres +DB_PASSWORD=postgres12341234 +DB_NAME=postgres +DB_PORT=5432 + +# 时区配置 +TZ=Asia/Shanghai + +# pgAdmin配置 +PGADMIN_EMAIL=fish@fish.com +PGADMIN_PASSWORD=12345678 \ No newline at end of file diff --git a/deploy/user_service/deploy.sh b/deploy/deploy.sh similarity index 100% rename from deploy/user_service/deploy.sh rename to deploy/deploy.sh diff --git a/scripts/db-lanuch-entrypoint.sh b/deploy/scripts/db-lanuch-entrypoint.sh similarity index 100% rename from scripts/db-lanuch-entrypoint.sh rename to deploy/scripts/db-lanuch-entrypoint.sh diff --git a/sql/01_uuid_v7_setup.sql b/deploy/sql/01_uuid_v7_setup.sql similarity index 100% rename from sql/01_uuid_v7_setup.sql rename to deploy/sql/01_uuid_v7_setup.sql diff --git a/sql/02_create_user_table.sql b/deploy/sql/02_create_user_table.sql similarity index 100% rename from sql/02_create_user_table.sql rename to deploy/sql/02_create_user_table.sql diff --git a/sql/03_create_account_table.sql b/deploy/sql/03_create_account_table.sql similarity index 100% rename from sql/03_create_account_table.sql rename to deploy/sql/03_create_account_table.sql diff --git a/sql/04_create_password_table.sql b/deploy/sql/04_create_password_table.sql similarity index 100% rename from sql/04_create_password_table.sql rename to deploy/sql/04_create_password_table.sql diff --git a/sql/05_create_account_password_view.sql b/deploy/sql/05_create_account_password_view.sql similarity index 100% rename from sql/05_create_account_password_view.sql rename to deploy/sql/05_create_account_password_view.sql