From 8871ac27dfdc71e37c263892b8e88e2889f108e9 Mon Sep 17 00:00:00 2001 From: JiaJu Zhuang <5152853@qq.com> Date: Sun, 23 Jul 2023 19:44:45 +0800 Subject: [PATCH] Modify Docker Publishing File --- README.md | 11 ++++++++++- README_CN.md | 17 +++++++---------- .../web/api/controller/SystemController.java | 3 --- docker/Dockerfile | 4 +++- docker/docker-build.sh | 3 +++ docker/docker-compose.yml | 2 ++ docker/docker-start.sh | 2 +- 7 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 docker/docker-build.sh diff --git a/README.md b/README.md index 9cd6a75e..0a9d6b51 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,16 @@ To facilitate users' quick use of AI capabilities, you can scan the QR code belo ## 📦 Docker installation ```bash -docker pull chat2db/chat2db:latest +```bash + // Pull the latest client, then run Docker with the name 'chat2db', and mount 'root. chat2db' to '~. chat2db Docker'` + docker run --name=chat2db -ti -p 10824:10824 -v ~/.chat2db-docker:/root/.chat2db chat2db/chat2db:latest + // The normal prompt here is' Tomcat started on port (s): 10824 (http) with context path ', which will complete the process + + // If the prompt 'The container name "chat2db" is already in use by container' appears here, it means that the container already exists and is running + docker start chat2db + // If you want to update chat2db, you need to first rm + docker rm chat2db +``` ``` ## 🎯 Operating Environment diff --git a/README_CN.md b/README_CN.md index 32afecc8..e24e4206 100644 --- a/README_CN.md +++ b/README_CN.md @@ -125,17 +125,14 @@ https://github.com/chat2db/Chat2DB/assets/22975773/b58db908-5768-4a71-aa30-135d2 ## 📦 Docker 部署 ```bash - docker pull chat2db/chat2db:latest - // 前台运行,运行后不能关闭命令行 - docker run -ti --name=chat2db -p 10824:10824 chat2db/chat2db:latest - // 后台运行,运行后可以关闭命令行 - docker run --name=chat2db -p 10824:10824 chat2db/chat2db:latest - // 这里正常会提示 Tomcat started on port(s): 10824 (http) with context path 就可以结束了 + // 拉取最新客户端,然后运行docker,名字是 `chat2db` , 并且将 `/root/.chat2db` 挂载到 `~/.chat2db-docker` + docker run --name=chat2db -ti -p 10824:10824 -v ~/.chat2db-docker:/root/.chat2db chat2db/chat2db:latest + // 这里正常会提示`Tomcat started on port(s): 10824 (http) with context path` 就可以结束了 - // 如果这里提示 The container name "/chat2db" is already in use by container, 代表已经存在容器了 运行 - dcoker run chat2db - // 如果想更新chat2db 则需要先rm 再运行 - dcoker rm chat2db + // 如果这里提示 `The container name "/chat2db" is already in use by container`, 代表已经存在容器了 运行 + docker start chat2db + // 如果想更新chat2db 则需要先rm + docker rm chat2db ``` ## 🎯 运行环境 diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/SystemController.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/SystemController.java index 5d6d9bc6..9f7c05cb 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/SystemController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/SystemController.java @@ -40,9 +40,6 @@ public class SystemController { */ @GetMapping public DataResult get() { - log.info("locale:{}", LocaleContextHolder.getLocale()); - log.info("error message:{}", I18nUtils.getMessage("common.systemError")); - log.info("error message:{}", I18nUtils.getMessage("common.paramDetailError", new Object[] {"参数呀"})); return DataResult.of("success"); } diff --git a/docker/Dockerfile b/docker/Dockerfile index 8d4fcdbf..06dc6a07 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,7 +4,9 @@ FROM openjdk:17 WORKDIR /app # 将当前目录下的jar包复制到docker容器的/app 目录下 ADD chat2db-server/chat2db-server-start/target/chat2db-server-start.jar chat2db-server-start.jar +# 将当前目录下的lib包复制到docker容器的/app/lib 目录下 +ADD chat2db-server/chat2db-server-start/target/lib lib # 让当前容器暴露10824 EXPOSE 10824 # 运行jar包 -ENTRYPOINT ["java","-Dspring.profiles.active=release","-jar","chat2db-server-start.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Dloader.path=lib","-Dspring.profiles.active=release","-jar","chat2db-server-start.jar"] \ No newline at end of file diff --git a/docker/docker-build.sh b/docker/docker-build.sh new file mode 100644 index 00000000..3019033e --- /dev/null +++ b/docker/docker-build.sh @@ -0,0 +1,3 @@ +# 先打包 出来 chat2db-server/chat2db-server-start/target/chat2db-server-start.jar +# 打包 +docker build -t chat2db/chat2db:test -f docker/Dockerfile . \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 13b58b2b..9311f506 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -3,5 +3,7 @@ services: chat2db: image: chat2db/chat2db:latest container_name: chat2db-latest + volumes: + - ~/.chat2db-docker:/root/.chat2db ports: - "10824:10824" \ No newline at end of file diff --git a/docker/docker-start.sh b/docker/docker-start.sh index 59c3864a..57f6b27b 100644 --- a/docker/docker-start.sh +++ b/docker/docker-start.sh @@ -1 +1 @@ -docker run --rm -ti -p 10824:10824 chat2db/chat2db:latest \ No newline at end of file +docker run --name=chat2db -p 10824:10824 -v ~/.chat2db-docker:/root/.chat2db chat2db/chat2db:latest \ No newline at end of file