diff --git a/.gitignore b/.gitignore index 3435ace4..a23b0ea7 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,8 @@ build/ docs/node_modules docs/build docs/.docusaurus + + +### Docker ### +docker/threadpool/conf +docker/threadpool/target \ No newline at end of file diff --git a/threadpool/server/bootstrap/Dockerfile b/docker/threadpool/Dockerfile similarity index 100% rename from threadpool/server/bootstrap/Dockerfile rename to docker/threadpool/Dockerfile diff --git a/threadpool/server/bootstrap/docker-startup.sh b/docker/threadpool/docker-startup.sh similarity index 100% rename from threadpool/server/bootstrap/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 826bb99f..2f81a57e 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 工程路径下 # 默认打包是打包的 tag 是 latest -docker build -t hippo4j/hippo4j-server ../hippo4j-bootstrap +docker build -t hippo4j/hippo4j-server ../threadpool ``` 方式二: @@ -45,6 +46,6 @@ docker build -t hippo4j/hippo4j-server ../hippo4j-bootstrap 通过 `maven docker plugin` ```shell -# 进入到 hippo4j-server 工程路径下 +# 进入到 threadpool/server/bootstrap 工程路径下 mvn clean package -DskipTests -Dskip.spotless.apply=true docker:build ``` 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 826bb99f..2f81a57e 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 @@ -34,10 +34,11 @@ hippo4j/hippo4j-server 方式一: ```shell -# 进入到 hippo4j-server/hippo4j-bootstrap 工程路径下 +# 进入到 threadpool/server/bootstrap 工程路径下 mvn clean package -Dskip.spotless.apply=true +# 进入到 docker/threadpool 工程路径下 # 默认打包是打包的 tag 是 latest -docker build -t hippo4j/hippo4j-server ../hippo4j-bootstrap +docker build -t hippo4j/hippo4j-server ../threadpool ``` 方式二: @@ -45,6 +46,6 @@ docker build -t hippo4j/hippo4j-server ../hippo4j-bootstrap 通过 `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 d3fb3002..2fd29939 100644 --- a/threadpool/server/bootstrap/pom.xml +++ b/threadpool/server/bootstrap/pom.xml @@ -11,6 +11,7 @@ true + ${project.parent.parent.parent.basedir}/docker/threadpool @@ -58,19 +59,69 @@ - com.spotify + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources + package + + copy-resources + + + UTF-8 + ../../../docker/threadpool/conf/ + + + conf + + hippo4j-logback.xml + application.properties + application-h2.properties + + + + + + + copy-build + package + + copy-resources + + + UTF-8 + ../../../docker/threadpool/target + + + target + + + + + + + + io.fabric8 docker-maven-plugin - 1.2.2 + 0.42.1 - hippo4j-server:${project.version} - ${project.basedir} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - + + + hippo4j/${project.build.finalName}:${project.version} + ${project.build.finalName} + + ${contextDir} + + + + hippo4j/${project.build.finalName}:latest + ${project.build.finalName} + + ${contextDir} + + +