From ca256373c547122ef22388553af7500b4fc71b41 Mon Sep 17 00:00:00 2001
From: BigXin0109 <1064730540@qq.com>
Date: Sun, 21 May 2023 16:25:00 +0800
Subject: [PATCH]  Remove the threadpool directory under docker #1303  (#1315)

---
 .gitignore                                                  | 4 ++--
 docker/{threadpool => }/Dockerfile                          | 0
 docker/{threadpool => }/docker-startup.sh                   | 0
 docs/docs/user_docs/ops/server-docker.md                    | 4 ++--
 .../current/user_docs/ops/server-docker.md                  | 4 ++--
 threadpool/server/bootstrap/pom.xml                         | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename docker/{threadpool => }/Dockerfile (100%)
 rename docker/{threadpool => }/docker-startup.sh (100%)

diff --git a/.gitignore b/.gitignore
index b43da0e6..86147440 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,5 +49,5 @@ docs/.docusaurus
 
 
 ### Docker ###
-docker/threadpool/conf
-docker/threadpool/target
\ No newline at end of file
+docker/conf
+docker/target
\ No newline at end of file
diff --git a/docker/threadpool/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from docker/threadpool/Dockerfile
rename to docker/Dockerfile
diff --git a/docker/threadpool/docker-startup.sh b/docker/docker-startup.sh
similarity index 100%
rename from docker/threadpool/docker-startup.sh
rename to docker/docker-startup.sh
diff --git a/docs/docs/user_docs/ops/server-docker.md b/docs/docs/user_docs/ops/server-docker.md
index 2f81a57e..7b106a2c 100644
--- a/docs/docs/user_docs/ops/server-docker.md
+++ b/docs/docs/user_docs/ops/server-docker.md
@@ -36,9 +36,9 @@ hippo4j/hippo4j-server
 ```shell
 # 进入到 threadpool/server/bootstrap 工程路径下
 mvn clean package -Dskip.spotless.apply=true
-# 进入到  docker/threadpool 工程路径下
+# 进入到  docker 工程路径下
 # 默认打包是打包的 tag 是 latest
-docker build -t hippo4j/hippo4j-server ../threadpool 
+docker build -t hippo4j/hippo4j-server ../docker 
 ```
 
 方式二：
diff --git a/docs/i18n/zh/docusaurus-plugin-content-docs/current/user_docs/ops/server-docker.md b/docs/i18n/zh/docusaurus-plugin-content-docs/current/user_docs/ops/server-docker.md
index 2f81a57e..7b106a2c 100644
--- a/docs/i18n/zh/docusaurus-plugin-content-docs/current/user_docs/ops/server-docker.md
+++ b/docs/i18n/zh/docusaurus-plugin-content-docs/current/user_docs/ops/server-docker.md
@@ -36,9 +36,9 @@ hippo4j/hippo4j-server
 ```shell
 # 进入到 threadpool/server/bootstrap 工程路径下
 mvn clean package -Dskip.spotless.apply=true
-# 进入到  docker/threadpool 工程路径下
+# 进入到  docker 工程路径下
 # 默认打包是打包的 tag 是 latest
-docker build -t hippo4j/hippo4j-server ../threadpool 
+docker build -t hippo4j/hippo4j-server ../docker 
 ```
 
 方式二：
diff --git a/threadpool/server/bootstrap/pom.xml b/threadpool/server/bootstrap/pom.xml
index 2fd29939..071f18a3 100644
--- a/threadpool/server/bootstrap/pom.xml
+++ b/threadpool/server/bootstrap/pom.xml
@@ -11,7 +11,7 @@
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
-        <contextDir>${project.parent.parent.parent.basedir}/docker/threadpool</contextDir>
+        <contextDir>${project.parent.parent.parent.basedir}/docker</contextDir>
     </properties>
     
     <dependencies>
@@ -70,7 +70,7 @@
                         </goals>
                         <configuration>
                             <encoding>UTF-8</encoding>
-                            <outputDirectory>../../../docker/threadpool/conf/</outputDirectory>
+                            <outputDirectory>../../../docker/conf/</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>conf</directory>
@@ -91,7 +91,7 @@
                         </goals>
                         <configuration>
                             <encoding>UTF-8</encoding>
-                            <outputDirectory>../../../docker/threadpool/target</outputDirectory>
+                            <outputDirectory>../../../docker/target</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>target</directory>