From f92f66f9ebc1085348554c2c144cbbabfa9e57ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=89=91=E9=91=AB?= <1064730540@qq.com>
Date: Mon, 15 May 2023 21:46:44 +0800
Subject: [PATCH] feat: Server mode Docker packaging function migrated to the
 root directory

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

diff --git a/.gitignore b/.gitignore
index f10c5ce9..a23b0ea7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,5 +49,5 @@ docs/.docusaurus
 
 
 ### Docker ###
-docker/threadpool/server/conf
-docker/threadpool/server/target
\ No newline at end of file
+docker/threadpool/conf
+docker/threadpool/target
\ No newline at end of file
diff --git a/docker/threadpool/server/Dockerfile b/docker/threadpool/Dockerfile
similarity index 100%
rename from docker/threadpool/server/Dockerfile
rename to docker/threadpool/Dockerfile
diff --git a/docker/threadpool/server/docker-startup.sh b/docker/threadpool/docker-startup.sh
similarity index 100%
rename from docker/threadpool/server/docker-startup.sh
rename to docker/threadpool/docker-startup.sh
diff --git a/docs/docs/user_docs/ops/server-docker.md b/docs/docs/user_docs/ops/server-docker.md
index 6610b519..2f81a57e 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/server 工程路径下
+# 进入到  docker/threadpool 工程路径下
 # 默认打包是打包的 tag 是 latest
-docker build -t hippo4j/hippo4j-server ../server 
+docker build -t hippo4j/hippo4j-server ../threadpool 
 ```
 
 方式二：
@@ -46,6 +46,6 @@ docker build -t hippo4j/hippo4j-server ../server
 通过 `maven docker plugin`
 
 ```shell
-# 进入到 hippo4j-server 工程路径下
+# 进入到 threadpool/server/bootstrap 工程路径下
 mvn clean package -DskipTests -Dskip.spotless.apply=true docker:build
 ```
diff --git a/threadpool/server/bootstrap/pom.xml b/threadpool/server/bootstrap/pom.xml
index 734dae47..58e1695b 100644
--- a/threadpool/server/bootstrap/pom.xml
+++ b/threadpool/server/bootstrap/pom.xml
@@ -11,6 +11,7 @@
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
+        <contextDir>${project.parent.parent.parent.basedir}/docker/threadpool</contextDir>
     </properties>
     
     <dependencies>
@@ -69,7 +70,7 @@
                         </goals>
                         <configuration>
                             <encoding>UTF-8</encoding>
-                            <outputDirectory>../../../docker/threadpool/server/conf/</outputDirectory>
+                            <outputDirectory>../../../docker/threadpool/conf/</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>conf</directory>
@@ -90,7 +91,7 @@
                         </goals>
                         <configuration>
                             <encoding>UTF-8</encoding>
-                            <outputDirectory>../../../docker/threadpool/server/target</outputDirectory>
+                            <outputDirectory>../../../docker/threadpool/target</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>target</directory>
@@ -101,19 +102,30 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.spotify</groupId>
+                <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.2</version>
+                <version>0.42.1</version>
                 <configuration>
-                    <imageName>hippo4j-server:${project.version}</imageName>
-                    <dockerDirectory>${project.basedir}</dockerDirectory>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
+                    <images>
+                        <image>
+                            <!--镜像名(含版本号)-->
+                            <name>hippo4j/${project.build.finalName}:${project.version}</name>
+                            <!--别名:用于容器命名和在docker-compose.yml文件只能找到对应名字的配置-->
+                            <alias>${project.build.finalName}</alias>
+                            <build>
+                                <contextDir>${contextDir}</contextDir>
+                            </build>
+                        </image>
+                        <image>
+                            <!--镜像名(含版本号)-->
+                            <name>hippo4j/${project.build.finalName}:latest</name>
+                            <!--别名:用于容器命名和在docker-compose.yml文件只能找到对应名字的配置-->
+                            <alias>${project.build.finalName}</alias>
+                            <build>
+                                <contextDir>${contextDir}</contextDir>
+                            </build>
+                        </image>
+                    </images>
                 </configuration>
             </plugin>
         </plugins>