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

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

diff --git a/.gitignore b/.gitignore
index 3435ace4..f10c5ce9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,8 @@ build/
 docs/node_modules
 docs/build
 docs/.docusaurus
+
+
+### Docker ###
+docker/threadpool/server/conf
+docker/threadpool/server/target
\ No newline at end of file
diff --git a/threadpool/server/bootstrap/Dockerfile b/docker/threadpool/server/Dockerfile
similarity index 100%
rename from threadpool/server/bootstrap/Dockerfile
rename to docker/threadpool/server/Dockerfile
diff --git a/threadpool/server/bootstrap/docker-startup.sh b/docker/threadpool/server/docker-startup.sh
similarity index 100%
rename from threadpool/server/bootstrap/docker-startup.sh
rename to docker/threadpool/server/docker-startup.sh
diff --git a/docs/docs/user_docs/ops/server-docker.md b/docs/docs/user_docs/ops/server-docker.md
index 826bb99f..6610b519 100644
--- a/docs/docs/user_docs/ops/server-docker.md
+++ b/docs/docs/user_docs/ops/server-docker.md
@@ -34,10 +34,11 @@ hippo4j/hippo4j-server
 方式一：
 
 ```shell
-# 进入到 hippo4j-server/hippo4j-bootstrap 工程路径下
+# 进入到 threadpool/server/bootstrap 工程路径下
 mvn clean package -Dskip.spotless.apply=true
+# 进入到  docker/threadpool/server 工程路径下
 # 默认打包是打包的 tag 是 latest
-docker build -t hippo4j/hippo4j-server ../hippo4j-bootstrap
+docker build -t hippo4j/hippo4j-server ../server 
 ```
 
 方式二：
diff --git a/threadpool/server/bootstrap/pom.xml b/threadpool/server/bootstrap/pom.xml
index d3fb3002..734dae47 100644
--- a/threadpool/server/bootstrap/pom.xml
+++ b/threadpool/server/bootstrap/pom.xml
@@ -57,6 +57,49 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <encoding>UTF-8</encoding>
+                            <outputDirectory>../../../docker/threadpool/server/conf/</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>conf</directory>
+                                    <includes>
+                                        <include>hippo4j-logback.xml</include>
+                                        <include>application.properties</include>
+                                        <include>application-h2.properties</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-build</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <encoding>UTF-8</encoding>
+                            <outputDirectory>../../../docker/threadpool/server/target</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>target</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>