diff --git a/README.md b/README.md index eb0bfc7..c3e01ff 100644 --- a/README.md +++ b/README.md @@ -122,10 +122,8 @@ make start-all # 启动 ollama 服务 (可选) ollama serve > /dev/null 2>&1 & -# 根据系统架构(amd64 或者 arm64)启动服务 -ARCH=amd64 docker compose up -d -# 或 -ARCH=arm64 docker compose up -d +# 启动服务 +docker compose up -d ``` #### ④ 停止服务 diff --git a/README_EN.md b/README_EN.md index f1982f2..04904b1 100644 --- a/README_EN.md +++ b/README_EN.md @@ -122,10 +122,8 @@ make start-all # Start ollama services (Optional) ollama serve > /dev/null 2>&1 & -# Start the service according to the system architecture (amd64 or arm64) -ARCH=amd64 docker compose up -d -# Or -ARCH=arm64 docker compose up -d +# Start the service +docker compose up -d ``` #### ④ Stop the services diff --git a/docker-compose.yml b/docker-compose.yml index 06ad049..ee673e3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: app: - image: wechatopenai/weknora-app:${ARCH}-latest + image: wechatopenai/weknora-app:latest container_name: WeKnora-app ports: - "8080:8080" @@ -88,7 +88,7 @@ services: - WeKnora-network frontend: - image: wechatopenai/weknora-ui:${ARCH}-latest + image: wechatopenai/weknora-ui:latest container_name: WeKnora-frontend ports: - "80:80" @@ -99,7 +99,7 @@ services: restart: unless-stopped docreader: - image: wechatopenai/weknora-docreader:${ARCH}-latest + image: wechatopenai/weknora-docreader:latest container_name: WeKnora-docreader ports: - "50051:50051" diff --git a/scripts/build_images.sh b/scripts/build_images.sh index 9885455..3862dc7 100755 --- a/scripts/build_images.sh +++ b/scripts/build_images.sh @@ -78,14 +78,11 @@ check_platform() { log_info "检测系统平台信息..." if [ "$(uname -m)" = "x86_64" ]; then export PLATFORM="linux/amd64" - export ARCH="amd64" elif [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "arm64" ]; then export PLATFORM="linux/arm64" - export ARCH="arm64" else log_warning "未识别的平台类型:$(uname -m),将使用默认平台 linux/amd64" export PLATFORM="linux/amd64" - export ARCH="amd64" fi log_info "当前平台:$PLATFORM" } @@ -102,7 +99,7 @@ build_app_image() { --build-arg GOPROXY_ARG=${GOPROXY:-"https://goproxy.cn,direct"} \ --build-arg GOSUMDB_ARG=${GOSUMDB:-"off"} \ -f docker/Dockerfile.app \ - -t wechatopenai/weknora-app:${ARCH}-latest \ + -t wechatopenai/weknora-app:latest \ . if [ $? -eq 0 ]; then @@ -124,7 +121,7 @@ build_docreader_image() { --platform $PLATFORM \ --build-arg PLATFORM=$PLATFORM \ -f docker/Dockerfile.docreader \ - -t wechatopenai/weknora-docreader:${ARCH}-latest \ + -t wechatopenai/weknora-docreader:latest \ . if [ $? -eq 0 ]; then @@ -145,7 +142,7 @@ build_frontend_image() { docker build \ --platform $PLATFORM \ -f frontend/Dockerfile \ - -t wechatopenai/weknora-ui:${ARCH}-latest \ + -t wechatopenai/weknora-ui:latest \ frontend/ if [ $? -eq 0 ]; then @@ -213,21 +210,21 @@ clean_images() { # 停止相关容器 log_info "停止相关容器..." - docker stop $(docker ps -q --filter "ancestor=wechatopenai/weknora-app:${ARCH}-latest" 2>/dev/null) 2>/dev/null || true - docker stop $(docker ps -q --filter "ancestor=wechatopenai/weknora-docreader:${ARCH}-latest" 2>/dev/null) 2>/dev/null || true - docker stop $(docker ps -q --filter "ancestor=wechatopenai/weknora-ui:${ARCH}-latest" 2>/dev/null) 2>/dev/null || true + docker stop $(docker ps -q --filter "ancestor=wechatopenai/weknora-app:latest" 2>/dev/null) 2>/dev/null || true + docker stop $(docker ps -q --filter "ancestor=wechatopenai/weknora-docreader:latest" 2>/dev/null) 2>/dev/null || true + docker stop $(docker ps -q --filter "ancestor=wechatopenai/weknora-ui:latest" 2>/dev/null) 2>/dev/null || true # 删除相关容器 log_info "删除相关容器..." - docker rm $(docker ps -aq --filter "ancestor=wechatopenai/weknora-app:${ARCH}-latest" 2>/dev/null) 2>/dev/null || true - docker rm $(docker ps -aq --filter "ancestor=wechatopenai/weknora-docreader:${ARCH}-latest" 2>/dev/null) 2>/dev/null || true - docker rm $(docker ps -aq --filter "ancestor=wechatopenai/weknora-ui:${ARCH}-latest" 2>/dev/null) 2>/dev/null || true + docker rm $(docker ps -aq --filter "ancestor=wechatopenai/weknora-app:latest" 2>/dev/null) 2>/dev/null || true + docker rm $(docker ps -aq --filter "ancestor=wechatopenai/weknora-docreader:latest" 2>/dev/null) 2>/dev/null || true + docker rm $(docker ps -aq --filter "ancestor=wechatopenai/weknora-ui:latest" 2>/dev/null) 2>/dev/null || true # 删除镜像 log_info "删除本地镜像..." - docker rmi wechatopenai/weknora-app:${ARCH}-latest 2>/dev/null || true - docker rmi wechatopenai/weknora-docreader:${ARCH}-latest 2>/dev/null || true - docker rmi wechatopenai/weknora-ui:${ARCH}-latest 2>/dev/null || true + docker rmi wechatopenai/weknora-app:latest 2>/dev/null || true + docker rmi wechatopenai/weknora-docreader:latest 2>/dev/null || true + docker rmi wechatopenai/weknora-ui:latest 2>/dev/null || true docker image prune -f diff --git a/scripts/start_all.sh b/scripts/start_all.sh index c9b5fc5..070ce12 100755 --- a/scripts/start_all.sh +++ b/scripts/start_all.sh @@ -299,14 +299,11 @@ check_platform() { log_info "检测系统平台信息..." if [ "$(uname -m)" = "x86_64" ]; then export PLATFORM="linux/amd64" - export ARCH="amd64" elif [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "arm64" ]; then export PLATFORM="linux/arm64" - export ARCH="arm64" else log_warning "未识别的平台类型:$(uname -m),将使用默认平台 linux/amd64" export PLATFORM="linux/amd64" - export ARCH="amd64" fi log_info "当前平台:$PLATFORM" }