Skip to content

Commit 19d2493

Browse files
committed
fix: make file docker build not work
1 parent 0e1d7ed commit 19d2493

File tree

2 files changed

+261
-178
lines changed

2 files changed

+261
-178
lines changed

Makefile

Lines changed: 41 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: help build run test clean docker-build docker-run migrate-up migrate-down docker-restart docker-stop start-all stop-all start-ollama stop-ollama build-images build-images-app build-images-docreader build-images-frontend clean-images
1+
.PHONY: help build run test clean docker-build docker-build-docreader docker-build-frontend docker-build-all docker-run migrate-up migrate-down docker-restart docker-stop start-all stop-all start-ollama stop-ollama build-images build-images-app build-images-docreader build-images-frontend clean-images check-env list-containers pull-images
22

33
# Show help
44
help:
@@ -11,10 +11,13 @@ help:
1111
@echo " clean 清理构建文件"
1212
@echo ""
1313
@echo "Docker 命令:"
14-
@echo " docker-build 构建 Docker 镜像"
15-
@echo " docker-run 运行 Docker 容器"
16-
@echo " docker-stop 停止 Docker 容器"
17-
@echo " docker-restart 重启 Docker 容器"
14+
@echo " docker-build-app 构建应用 Docker 镜像 (wechatopenai/weknora-app)"
15+
@echo " docker-build-docreader 构建文档读取器镜像 (wechatopenai/weknora-docreader)"
16+
@echo " docker-build-frontend 构建前端镜像 (wechatopenai/weknora-ui)"
17+
@echo " docker-build-all 构建所有 Docker 镜像"
18+
@echo " docker-run 运行 Docker 容器"
19+
@echo " docker-stop 停止 Docker 容器"
20+
@echo " docker-restart 重启 Docker 容器"
1821
@echo ""
1922
@echo "服务管理:"
2023
@echo " start-all 启动所有服务"
@@ -37,13 +40,18 @@ help:
3740
@echo " lint 代码检查"
3841
@echo " deps 安装依赖"
3942
@echo " docs 生成 API 文档"
43+
@echo ""
44+
@echo "环境检查:"
45+
@echo " check-env 检查环境配置"
46+
@echo " list-containers 列出运行中的容器"
47+
@echo " pull-images 拉取最新镜像"
4048

4149
# Go related variables
4250
BINARY_NAME=WeKnora
4351
MAIN_PATH=./cmd/server
4452

4553
# Docker related variables
46-
DOCKER_IMAGE=WeKnora
54+
DOCKER_IMAGE=wechatopenai/weknora-app
4755
DOCKER_TAG=latest
4856

4957
# Build the application
@@ -64,8 +72,19 @@ clean:
6472
rm -f $(BINARY_NAME)
6573

6674
# Build Docker image
67-
docker-build:
68-
docker build -t $(DOCKER_IMAGE):$(DOCKER_TAG) .
75+
docker-build-app:
76+
docker build -f docker/Dockerfile.app -t $(DOCKER_IMAGE):$(DOCKER_TAG) .
77+
78+
# Build docreader Docker image
79+
docker-build-docreader:
80+
docker build -f docker/Dockerfile.docreader -t wechatopenai/weknora-docreader:latest .
81+
82+
# Build frontend Docker image
83+
docker-build-frontend:
84+
docker build -f frontend/Dockerfile -t wechatopenai/weknora-ui:latest frontend/
85+
86+
# Build all Docker images
87+
docker-build-all: docker-build-app docker-build-docreader docker-build-frontend
6988

7089
# Run Docker container (传统方式)
7190
docker-run:
@@ -107,10 +126,10 @@ build-images-frontend:
107126
clean-images:
108127
./scripts/build_images.sh --clean
109128

110-
# Restart Docker container (stop, rebuild, start)
129+
# Restart Docker container (stop, start)
111130
docker-restart:
112131
docker-compose stop -t 60
113-
docker-compose up --build
132+
docker-compose up
114133

115134
# Database migrations
116135
migrate-up:
@@ -151,4 +170,16 @@ clean-db:
151170
docker volume rm weknora_redis_data; \
152171
fi
153172

173+
# Environment check
174+
check-env:
175+
./scripts/start_all.sh --check
176+
177+
# List containers
178+
list-containers:
179+
./scripts/start_all.sh --list
180+
181+
# Pull latest images
182+
pull-images:
183+
./scripts/start_all.sh --pull
184+
154185

0 commit comments

Comments
 (0)