From 9dc768562f73f4d569ddce8f435c1ed588e93baf Mon Sep 17 00:00:00 2001 From: neos Date: Fri, 19 Apr 2024 05:27:07 +0000 Subject: [PATCH] fix the nework error --- client/compose.yaml | 7 +++++++ client/env_sample | 3 ++- client/pb/README.md | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) mode change 100644 => 100755 client/compose.yaml mode change 100644 => 100755 client/env_sample mode change 100644 => 100755 client/pb/README.md diff --git a/client/compose.yaml b/client/compose.yaml old mode 100644 new mode 100755 index 44f7ede..0e51d87 --- a/client/compose.yaml +++ b/client/compose.yaml @@ -2,6 +2,7 @@ services: web: build: dockerfile: Dockerfile.web + image: wiseflow/web ports: - 8090:8090 # env_file: @@ -9,9 +10,13 @@ services: volumes: - ./pb/pb_data:/pb/pb_data # - ./${PROJECT_DIR}:/pb/${PROJECT_DIR} + api: build: dockerfile: Dockerfile.api + image: wiseflow/api + tty: true + stdin_open: true env_file: - .env ports: @@ -20,3 +25,5 @@ services: - ./${PROJECT_DIR}:/app/${PROJECT_DIR} - ${EMBEDDING_MODEL_PATH}:${EMBEDDING_MODEL_PATH} - ${RERANKER_MODEL_PATH}:${RERANKER_MODEL_PATH} + depends_on: + - web \ No newline at end of file diff --git a/client/env_sample b/client/env_sample old mode 100644 new mode 100755 index e04952f..f3035e9 --- a/client/env_sample +++ b/client/env_sample @@ -10,4 +10,5 @@ export DEVICE='' #**for processer** export PROJECT_DIR="" export WS_LOG="verbose" -export PB_API_AUTH='email|password' \ No newline at end of file +export PB_API_AUTH='test@example.com|123467890' +export PB_API_BASE='web:8090' ##可以参考https://stackoverflow.com/questions/70151702/how-to-network-2-separate-docker-containers-to-communicate-with-eachother \ No newline at end of file diff --git a/client/pb/README.md b/client/pb/README.md old mode 100644 new mode 100755 index 4542db9..ec20218 --- a/client/pb/README.md +++ b/client/pb/README.md @@ -8,5 +8,6 @@ ```bash cd pb +./pocketbase --dev admin create test@example.com 123467890 #如果没有初始账号,请用这个命令创建 ./pocketbase serve ``` \ No newline at end of file