Remove the threadpool directory under docker #1303 (#1315)

opengoofy · May 21, 2023 · ca25637 · ca25637
1 parent f041a78
commit ca25637
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,5 +49,5 @@ docs/.docusaurus
 
 
 ### Docker ###
-docker/threadpool/conf
-docker/threadpool/target
+docker/conf
+docker/target
diff --git a/docker/threadpool/Dockerfile → docker/Dockerfile b/docker/threadpool/Dockerfile → docker/Dockerfile
diff --git a/docker/threadpool/docker-startup.sh → docker/docker-startup.sh b/docker/threadpool/docker-startup.sh → docker/docker-startup.sh
diff --git 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
@@ -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
@@ -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>