Wendong-Fan commited on
Commit
78760a2
·
1 Parent(s): 58d3d27

update docker setting

Browse files
.container/.dockerignore CHANGED
@@ -35,7 +35,7 @@ var/
35
  .coverage
36
  htmlcov/
37
 
38
- # 虚拟环境
39
  venv/
40
  ENV/
41
  env/
@@ -48,18 +48,18 @@ env/
48
  *.swo
49
  .DS_Store
50
 
51
- # 临时文件
52
  temp_*
53
  *.tmp
54
  *.log
55
  *.bak
56
 
57
- # 缓存
58
  .cache/
59
  .npm/
60
  .yarn/
61
 
62
- # 大型数据文件
63
  *.csv
64
  *.sqlite
65
  *.db
@@ -70,5 +70,5 @@ temp_*
70
  *.pkl
71
  *.pickle
72
 
73
- # 数据目录
74
  data/
 
35
  .coverage
36
  htmlcov/
37
 
38
+ # Virtual environments
39
  venv/
40
  ENV/
41
  env/
 
48
  *.swo
49
  .DS_Store
50
 
51
+ # Temporary files
52
  temp_*
53
  *.tmp
54
  *.log
55
  *.bak
56
 
57
+ # Cache
58
  .cache/
59
  .npm/
60
  .yarn/
61
 
62
+ # Large data files
63
  *.csv
64
  *.sqlite
65
  *.db
 
70
  *.pkl
71
  *.pickle
72
 
73
+ # Data directory
74
  data/
.container/build_docker.bat CHANGED
@@ -5,6 +5,11 @@ setlocal enabledelayedexpansion
5
  echo 在Windows上构建Docker镜像...
6
  echo Building Docker image on Windows...
7
 
 
 
 
 
 
8
  REM 设置配置变量
9
  REM Set configuration variables
10
  set CACHE_DIR=.docker-cache\pip
@@ -110,11 +115,6 @@ if %ERRORLEVEL% EQU 0 (
110
  )
111
  )
112
 
113
- REM 设置Docker BuildKit环境变量
114
- REM Set Docker BuildKit environment variables
115
- set DOCKER_BUILDKIT=1
116
- set COMPOSE_DOCKER_CLI_BUILD=1
117
-
118
  echo 启用Docker BuildKit加速构建...
119
  echo Enabling Docker BuildKit to accelerate build...
120
 
 
5
  echo 在Windows上构建Docker镜像...
6
  echo Building Docker image on Windows...
7
 
8
+ REM 设置Docker BuildKit环境变量
9
+ REM Set Docker BuildKit environment variables
10
+ set DOCKER_BUILDKIT=1
11
+ set COMPOSE_DOCKER_CLI_BUILD=1
12
+
13
  REM 设置配置变量
14
  REM Set configuration variables
15
  set CACHE_DIR=.docker-cache\pip
 
115
  )
116
  )
117
 
 
 
 
 
 
118
  echo 启用Docker BuildKit加速构建...
119
  echo Enabling Docker BuildKit to accelerate build...
120
 
.container/build_docker.sh CHANGED
@@ -8,6 +8,10 @@ CLEAN_CACHE=0
8
  REBUILD=0
9
  SERVICE=""
10
 
 
 
 
 
11
  # 解析命令行参数 | Parse command line arguments
12
  while [[ $# -gt 0 ]]; do
13
  case "$1" in
@@ -65,10 +69,6 @@ if [ ! -f "$COMPOSE_FILE" ]; then
65
  exit 1
66
  fi
67
 
68
- # 设置Docker BuildKit环境变量 | Set Docker BuildKit environment variables
69
- export DOCKER_BUILDKIT=1
70
- export COMPOSE_DOCKER_CLI_BUILD=1
71
-
72
  echo "启用Docker BuildKit加速构建... | Enabling Docker BuildKit to accelerate build..."
73
 
74
  # 清理缓存(如果指定) | Clean cache (if specified)
 
8
  REBUILD=0
9
  SERVICE=""
10
 
11
+ # 设置Docker BuildKit环境变量 | Set Docker BuildKit environment variables
12
+ export DOCKER_BUILDKIT=1
13
+ export COMPOSE_DOCKER_CLI_BUILD=1
14
+
15
  # 解析命令行参数 | Parse command line arguments
16
  while [[ $# -gt 0 ]]; do
17
  case "$1" in
 
69
  exit 1
70
  fi
71
 
 
 
 
 
72
  echo "启用Docker BuildKit加速构建... | Enabling Docker BuildKit to accelerate build..."
73
 
74
  # 清理缓存(如果指定) | Clean cache (if specified)
.container/check_docker.sh CHANGED
@@ -73,11 +73,11 @@ FREE_SPACE=$(df -h . | awk 'NR==2 {print $4}')
73
  echo "可用磁盘空间 | Available disk space: $FREE_SPACE"
74
 
75
  # 检查是否有.env文件 | Check if .env file exists
76
- if [ ! -f "owl/.env" ]; then
77
- echo "警告 | Warning: 未找到owl/.env文件 | owl/.env file not found"
78
  echo "请运行以下命令创建环境变量文件 | Please run the following command to create environment variable file:"
79
- echo "cp owl/.env_template owl/.env"
80
- echo "然后编辑owl/.env文件,填写必要的API密钥 | Then edit owl/.env file and fill in necessary API keys"
81
  else
82
  echo "环境变量文件已存在 | Environment variable file exists"
83
  fi
 
73
  echo "可用磁盘空间 | Available disk space: $FREE_SPACE"
74
 
75
  # 检查是否有.env文件 | Check if .env file exists
76
+ if [ ! -f "../owl/.env" ]; then
77
+ echo "警告 | Warning: 未找到../owl/.env文件 | ../owl/.env file not found"
78
  echo "请运行以下命令创建环境变量文件 | Please run the following command to create environment variable file:"
79
+ echo "cp ../owl/.env_template ../owl/.env"
80
+ echo "然后编辑../owl/.env文件,填写必要的API密钥 | Then edit ../owl/.env file and fill in necessary API keys"
81
  else
82
  echo "环境变量文件已存在 | Environment variable file exists"
83
  fi
.container/docker-compose.yml CHANGED
@@ -13,7 +13,7 @@ services:
13
  # 挂载.env文件,方便配置API密钥
14
  - ../owl/.env:/app/owl/.env
15
  # 挂载数据目录
16
- - ./data:/app/data
17
  # 挂载缓存目录,避免重复下载
18
  - ~/.cache/pip:/root/.pip/cache
19
  - ~/.cache/playwright:/root/.cache/ms-playwright
@@ -24,7 +24,7 @@ services:
24
  - PYTHONUNBUFFERED=1
25
  - TERM=xterm-256color
26
  ports:
27
- - "8000:8000"
28
  stdin_open: true
29
  tty: true
30
  shm_size: 2gb
 
13
  # 挂载.env文件,方便配置API密钥
14
  - ../owl/.env:/app/owl/.env
15
  # 挂载数据目录
16
+ - ./data:/app/owl/data
17
  # 挂载缓存目录,避免重复下载
18
  - ~/.cache/pip:/root/.pip/cache
19
  - ~/.cache/playwright:/root/.cache/ms-playwright
 
24
  - PYTHONUNBUFFERED=1
25
  - TERM=xterm-256color
26
  ports:
27
+ - "7860:7860"
28
  stdin_open: true
29
  tty: true
30
  shm_size: 2gb
README.md CHANGED
@@ -279,7 +279,7 @@ docker-compose up -d
279
  docker-compose exec owl bash
280
 
281
  # activate the virtual environment
282
- cd .. && source .venv/bin/activate && cd owl
283
 
284
  playwright install-deps
285
 
 
279
  docker-compose exec owl bash
280
 
281
  # activate the virtual environment
282
+ cd .. && source .venv/bin/activate
283
 
284
  playwright install-deps
285
 
README_zh.md CHANGED
@@ -273,7 +273,7 @@ docker-compose up -d
273
  docker-compose exec owl bash
274
 
275
  # 激活虚拟环境
276
- cd .. && source .venv/bin/activate && cd owl
277
 
278
  playwright install-deps
279
 
 
273
  docker-compose exec owl bash
274
 
275
  # 激活虚拟环境
276
+ cd .. && source .venv/bin/activate
277
 
278
  playwright install-deps
279
 
examples/__init__.py ADDED
File without changes