From 7e7de2398e88c9298eb640af76b1cc196dd64a5f Mon Sep 17 00:00:00 2001 From: 克 刘 <4345453@qq.com> Date: Tue, 17 Mar 2020 14:05:25 +0800 Subject: [PATCH] 增加dockerfile --- .idea/workspace.xml | 15 +++++-- .idea/encodings.xml | 10 ----- .idea/compiler.xml | 9 ++-- pom.xml | 17 ++++++++ kidgrow-commons/kidgrow-common-spring-boot-starter/Dockerfile | 14 +++++++ 5 files changed, 45 insertions(+), 20 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 8435bc9..f73c118 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,6 +7,7 @@ <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <outputRelativeToContentRoot value="true" /> <module name="kidgrow-uaa-api" /> + <module name="kidgrow-swagger2-spring-boot-starter" /> <module name="kidgrow-springcloud-monitor-admin" /> <module name="kidgrow-filecenter-biz" /> <module name="kidgrow-web-hospital" /> @@ -16,7 +17,6 @@ <module name="kidgrow-jobs-samples" /> <module name="kidgrow-logcenter" /> <module name="kidgrow-springcloud-eureka" /> - <module name="kidgrow-ribbon-spring-boot-starter" /> <module name="kidgrow-sentinel-spring-boot-starter" /> <module name="kidgrow-common-spring-boot-starter" /> <module name="kidgrow-db-spring-boot-starter" /> @@ -24,12 +24,13 @@ <module name="kidgrow-config" /> <module name="kidgrow-authclient-spring-boot-starter" /> <module name="kidgrow-uaa-biz" /> - <module name="kidgrow-web-manager" /> <module name="kidgrow-demo-order" /> + <module name="kidgrow-mqcenter-rocket-consume" /> <module name="kidgrow-filecenter-server" /> <module name="kidgrow-springcloud-monitor-dashboard" /> <module name="kidgrow-log-spring-boot-starter" /> <module name="kidgrow-plugin-sms" /> + <module name="kidgrow-log-center" /> <module name="kidgrow-websocket-center" /> <module name="kidgrow-searchcenter-server" /> <module name="kidgrow-usercenter-server" /> @@ -42,9 +43,9 @@ <module name="kidgrow-uaa-server" /> <module name="kidgrow-searchcenter-client" /> <module name="kidgrow-plugin-mq" /> - <module name="kidgrow-swagger2-spring-boot-starter" /> + <module name="kidgrow-ribbon-spring-boot-starter" /> <module name="kidgrow-usercenter-biz" /> - <module name="kidgrow-mqcenter-rocket-consume" /> + <module name="kidgrow-web-manager" /> <module name="kidgrow-demo-product" /> <module name="kidgrow-jobs-admin" /> </profile> diff --git a/.idea/encodings.xml b/.idea/encodings.xml index edfcddd..33e9a81 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -4,19 +4,13 @@ <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-code-generator/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-code-generator/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-logcenter/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-logcenter/src/main/resources" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rocket/kidgrow-mqcenter-rocket-consume/src/main/java" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rocket/kidgrow-mqcenter-rocket-consume/src/main/resources" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rocket/kidgrow-mqcenter-rocket-product/src/main/java" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rocket/kidgrow-mqcenter-rocket-product/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-searchcenter/kidgrow-searchcenter-client/src/main/java" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-searchcenter/kidgrow-searchcenter-client/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-searchcenter/kidgrow-searchcenter-server/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-searchcenter/kidgrow-searchcenter-server/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java" charset="UTF-8" /> @@ -52,13 +46,10 @@ <file url="file://$PROJECT_DIR$/kidgrow-jobs/kidgrow-jobs-admin/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-jobs/kidgrow-jobs-admin/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-jobs/kidgrow-jobs-core/src/main/java" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/kidgrow-jobs/kidgrow-jobs-core/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-jobs/kidgrow-jobs-samples/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-jobs/kidgrow-jobs-samples/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-plugin/kidgrow-plugin-email/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-plugin/kidgrow-plugin-email/src/main/resources" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/kidgrow-plugin/kidgrow-plugin-mq/src/main/java" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/kidgrow-plugin/kidgrow-plugin-mq/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-plugin/kidgrow-plugin-sms/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-plugin/kidgrow-plugin-sms/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-springcloud/kidgrow-springcloud-eureka/src/main/java" charset="UTF-8" /> @@ -70,7 +61,6 @@ <file url="file://$PROJECT_DIR$/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-uaa/kidgrow-uaa-api/src/main/java" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/kidgrow-uaa/kidgrow-uaa-api/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-uaa/kidgrow-uaa-biz/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-uaa/kidgrow-uaa-biz/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/kidgrow-uaa/kidgrow-uaa-server/src/main/java" charset="UTF-8" /> diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 348d319..237d084 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="aea2b99e-00ff-4ea5-b353-a3f1702228c0" name="Default Changelist" comment="" /> + <list default="true" id="aea2b99e-00ff-4ea5-b353-a3f1702228c0" name="Default Changelist" comment=""> + <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> + </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> @@ -83,7 +88,7 @@ <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit4" value="" /> <property name="dynamic.classpath" value="true" /> <property name="last_directory_selection" value="$PROJECT_DIR$/kidgrow-business/kidgrow-websocket-center/src/main/java/com/kidgrow" /> - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../pasq-microservices-platform" /> <property name="node.js.detected.package.eslint" value="true" /> <property name="node.js.detected.package.tslint" value="true" /> <property name="node.js.path.for.package.eslint" value="project" /> @@ -555,11 +560,11 @@ <screen x="0" y="0" width="2048" height="1250" /> </state> <state width="475" height="466" key="DebuggerActiveHint/0.0.2048.1250@0.0.2048.1250" timestamp="1583481815003" /> - <state x="2961" y="330" width="861" height="465" key="FileChooserDialogImpl" timestamp="1584348777771"> - <screen x="2560" y="0" width="1920" height="1050" /> + <state x="428" y="393" width="861" height="465" key="FileChooserDialogImpl" timestamp="1584424780970"> + <screen x="0" y="0" width="2048" height="1250" /> </state> <state x="2961" y="330" key="FileChooserDialogImpl/0.0.2048.1250/2560.0.1920.1050@2560.0.1920.1050" timestamp="1584348777771" /> - <state x="428" y="393" width="861" height="465" key="FileChooserDialogImpl/0.0.2048.1250@0.0.2048.1250" timestamp="1584008245668" /> + <state x="428" y="393" width="861" height="465" key="FileChooserDialogImpl/0.0.2048.1250@0.0.2048.1250" timestamp="1584424780970" /> <state width="2005" height="233" key="GridCell.Tab.0.bottom" timestamp="1584177029445"> <screen x="0" y="0" width="2048" height="1250" /> </state> diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/Dockerfile b/kidgrow-commons/kidgrow-common-spring-boot-starter/Dockerfile new file mode 100644 index 0000000..fef5f1e --- /dev/null +++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/Dockerfile @@ -0,0 +1,14 @@ +# 基础镜像 +FROM openjdk:8-jdk-alpine +# 作者(可选) +MAINTAINER kidgrow +# 删除无用组件 优化容器体积(可选) +RUN rm -rf /var/lib/apt/lists/* +# 创建jar包存放目录 +RUN mkdir -p /usr/local/kidgrow +# 获取pom文件中build参数 +ARG JAR_FILE +# copy当前工程jar包至容器内 +COPY ${JAR_FILE} /usr/local/kidgrow/app.jar +# 运行jar包 +ENTRYPOINT ["java","-jar","/usr/local/kidgrow/app.jar"] \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6fb9366..b2d4d08 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ <easyCaptcha.version>1.6.2</easyCaptcha.version> <userAgent.version>1.21</userAgent.version> <oauth2-resource.version>5.1.7.RELEASE</oauth2-resource.version> - <docker-maven-plugin.version>1.2.2</docker-maven-plugin.version> + <docker-maven-plugin.version>1.4.10</docker-maven-plugin.version> <velocity.version>1.7</velocity.version> <commons-configuration2.version>2.6</commons-configuration2.version> <txlcn.version>5.0.2.RELEASE</txlcn.version> @@ -85,6 +85,11 @@ <jaxb-runtime.version>2.3.0</jaxb-runtime.version> <jaxb-impl.version>2.3.0</jaxb-impl.version> <sonar.exclusions>kidgrow-jobs/**/* kidgrow-web/**/*</sonar.exclusions> + <docker.baseImage>openjdk:8-jre-alpine</docker.baseImage> + <docker.volumes>/tmp</docker.volumes> + <docker.image.prefix>kidgrow</docker.image.prefix> + <!--docker harbor地址--> + <docker.repostory>192.168.2.240:8081</docker.repostory> </properties> <dependencies> @@ -548,6 +553,16 @@ <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId> <version>${docker-maven-plugin.version}</version> + <configuration> + <!-- Dockerfile目录指定 --> + <dockerfile>Dockerfile</dockerfile> + <repository>${docker.repostory}/${docker.image.prefix}/${project.artifactId}</repository> + <!-- 生成镜像标签 如不指定 默认为latest --> + <tag>1.0.0</tag> + <buildArgs> + <JAR_FILE>./target/${project.build.finalName}.jar</JAR_FILE> + </buildArgs> + </configuration> </plugin> </plugins> </pluginManagement> -- Gitblit v1.8.0