From e595b19e61f972711a9b9fd1059267820d4852b2 Mon Sep 17 00:00:00 2001
From: 11353 <1135361399@qq.com>
Date: Fri, 1 Apr 2022 22:33:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:docker=E6=89=93=E5=8D=B0=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E4=B8=8A=E4=BC=A0=E9=98=BF=E9=87=8C=E4=BA=91?=
 =?UTF-8?q?=E5=BE=85=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml               | 32 +++----------------
 ruoyi-auth/pom.xml    | 73 +++++--------------------------------------
 ruoyi-gateway/pom.xml | 50 +++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 94 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3dab0a6b..0012779d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,11 +46,13 @@
         <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
         <dockerfile.maven.plugin.version>1.4.13</dockerfile.maven.plugin.version>
         <compiler.maven.plugin.version>3.10.1</compiler.maven.plugin.version>
+        <google.jib.version>3.2.0</google.jib.version>
 
 
         <docker.registry>registry.cn-guangzhou.aliyuncs.com</docker.registry>
         <docker.space>ry_base</docker.space>
         <docker.warehouse>ry</docker.warehouse>
+        <docker.base.jre>registry.cn-guangzhou.aliyuncs.com/ry_base/base:openJdk-8u322-jre</docker.base.jre>
     </properties>
 
     <!-- 依赖声明 -->
@@ -312,36 +314,9 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>${google.jib.version}</version>
             </plugin>
 
-            <!--  Dockerfile 新插件  -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-            <artifactId>dockerfile-maven-plugin</artifactId>
-            <version>${dockerfile.maven.plugin.version}</version>
-            <executions>
-                <execution>
-                    <id>default</id>
-                    <goals>
-                        <!--如果package时不想用docker打包,就注释掉这个goal-->
-                        <!-- <goal>build</goal>-->
-                        <goal>push</goal>
-                    </goals>
-                </execution>
-            </executions>
-            <configuration>
-                <username>sino-tech-admin</username>
-                <password>Fros_1234</password>
-                <repository>175.178.38.240:8076/${artifactId}</repository>
-                <tag>${project.version}</tag>
-                <buildArgs>
-                    <!--提供参数向Dockerfile传递-->
-                    <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                </buildArgs>
-            </configuration>
-        </plugin>
-
         <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -354,6 +329,7 @@
             </plugin>
         </plugins>
     </build>
+
     <profiles>
         <profile>
             <id>local</id>
diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml
index 536cb1ec..78033b58 100644
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@@ -76,24 +76,22 @@
                 <configuration>
                     <from>
                         <!--使用openjdk官方镜像，tag是8-jdk-stretch，表示镜像的操作系统是debian9,装好了jdk8-->
-                        <image>registry.cn-guangzhou.aliyuncs.com/ry_base/base/openjdk:8u322-jre</image>
+                        <image>${docker.base.jre}</image>
                     </from>
                     <to>
                         <!-- 如果是阿里云的容器镜像仓库，则使用容器的配置 前缀/命名空间/仓库名 -->
                         <image>${docker.registry}/${docker.space}/${docker.warehouse}</image>
                         <tags>
-                            <!--指定包名-->
-                            <image>${artifactId}</image>
-                            <!--版本号-->
-                            <tag>${project.version}</tag>
+                            <!--指定包名 + 版本号即可-->
+                            <image>${artifactId}-${version}</image>
                         </tags>
                     </to>
                     <!--容器相关的属性-->
                     <container>
                         <!--jvm内存参数-->
                         <jvmFlags>
-                            <jvmFlag>-Xms1g</jvmFlag>
-                            <jvmFlag>-Xmx1g</jvmFlag>
+                            <jvmFlag>-Xms512m</jvmFlag>
+                            <jvmFlag>-Xmx512m</jvmFlag>
                         </jvmFlags>
                         <!--要暴露的端口-->
                         <ports>
@@ -103,7 +101,7 @@
                         <!--<useCurrentTimestamp>true</useCurrentTimestamp>-->
                         <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
                         <!--解决Could not find or load main class ${start-class} -->
-                        <mainClass>com.bpo.BpoSignAppllication</mainClass>
+                        <mainClass>com.ruoyi.auth.RuoYiAuthApplication</mainClass>
                         <!-- 设置时区  -->
                         <environment>
                             <TZ>Asia/Shanghai</TZ>
@@ -115,70 +113,13 @@
                 <!-- 把 jib 绑定到 Maven 命令中-->
                 <executions>
                     <execution>
-                        <phase>install</phase> <!-- 表示执行mvn install命令的时候就会自动构建镜像了-->
+                        <phase>package</phase> <!-- 表示执行mvn package命令的时候就会自动构建镜像了-->
                         <goals>
                             <goal>${jib.key}</goal><!-- 表示执行的jib命令  是dockerBuild 还是build-->
                         </goals>
                     </execution>
                 </executions>
             </plugin>
-
-
-
-
-
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>dockerfile-maven-plugin</artifactId>-->
-<!--                <configuration>-->
-<!--                    <username>sino-tech-admin</username>-->
-<!--                    <password>Fros_1234</password>-->
-                    <!--指定包名-->
-<!--                    <repository>${project.artifactId}</repository>-->
-<!--                    <tag>${project.version}</tag>-->
-<!--                    <buildArgs>-->
-<!--                        &lt;!&ndash;提供参数向Dockerfile传递&ndash;&gt;-->
-<!--                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>-->
-<!--                    </buildArgs>-->
-<!--                </configuration>-->
-<!--                <configuration>-->
-<!--                    <dockerfile>-->
-<!--                        <buildArgs>-->
-<!--                            &lt;!&ndash;注意imageName一定要是符合正则[a-z0-9-_.]的，否则构建不会成功&ndash;&gt;-->
-<!--                            <imageName>${project.artifactId}:last</imageName>-->
-<!--                            &lt;!&ndash;指定基础镜像&ndash;&gt;-->
-<!--                            <baseImage>openjdk:8-jre</baseImage>-->
-<!--                            &lt;!&ndash;指定远程docker地址&ndash;&gt;-->
-<!--                            &lt;!&ndash;使用http协议  https 需要加TLS证书&ndash;&gt;-->
-<!--                            <dockerHost>http://175.178.38.240:8076</dockerHost>-->
-<!--                            &lt;!&ndash;                    &lt;!&ndash;配置TLS证书在系统中的路径&ndash;&gt;&ndash;&gt;-->
-<!--                            &lt;!&ndash;                    <dockerCertPath>/Users/root/docker-ca</dockerCertPath>&ndash;&gt;-->
-<!--                            &lt;!&ndash; 指定默认挂载地址 &ndash;&gt;-->
-<!--                            <volumes>/mydata/service/ruoyi</volumes>-->
-<!--                            &lt;!&ndash; 创建目录&ndash;&gt;-->
-<!--                            <runs>mkdir -p /mydata/service/ruoyi</runs>-->
-<!--                            <workdir>/mydata/service/ruoyi</workdir>-->
-<!--                            <entryPoint>-->
-<!--                                ["java", "-jar", "-Dspring.profiles.active=dev","/mydata/service/ruoyi/${project.build.finalName}.jar"]-->
-<!--                            </entryPoint>-->
-<!--                            &lt;!&ndash;                    <buildArgs>&ndash;&gt;-->
-<!--                            &lt;!&ndash;                        <JAR-FILE>target/${project.build.finalName}.jar</JAR-FILE>&ndash;&gt;-->
-<!--                            &lt;!&ndash;                    </buildArgs>&ndash;&gt;-->
-<!--                            &lt;!&ndash;复制jar包到docker容器指定目录&ndash;&gt;-->
-<!--                            &lt;!&ndash;                    <resources>&ndash;&gt;-->
-<!--                            &lt;!&ndash;                        <resource>&ndash;&gt;-->
-<!--                            &lt;!&ndash;                            <targetPath>/mydata/service/ruoyi</targetPath>&ndash;&gt;-->
-<!--                            &lt;!&ndash;                            &lt;!&ndash;jar包在项目中生成的路径，即对应的target目录&ndash;&gt;&ndash;&gt;-->
-<!--                            &lt;!&ndash;                            <directory>${project.build.directory}</directory>&ndash;&gt;-->
-<!--                            &lt;!&ndash;                            &lt;!&ndash;指定需要复制的文件&ndash;&gt;&ndash;&gt;-->
-<!--                            &lt;!&ndash;                            <include>${project.build.finalName}.jar</include>&ndash;&gt;-->
-<!--                            &lt;!&ndash;                        </resource>&ndash;&gt;-->
-<!--                            &lt;!&ndash;                    </resources>&ndash;&gt;-->
-<!--                        </buildArgs>-->
-<!--                    </dockerfile>-->
-
-<!--                </configuration>-->
-<!--            </plugin>-->
         </plugins>
     </build>
    
diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml
index fc1d58c4..4eac55ec 100644
--- a/ruoyi-gateway/pom.xml
+++ b/ruoyi-gateway/pom.xml
@@ -87,6 +87,56 @@
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>jib-maven-plugin</artifactId>
+                <configuration>
+                    <from>
+                        <!--使用openjdk官方镜像，tag是8-jdk-stretch，表示镜像的操作系统是debian9,装好了jdk8-->
+                        <image>${docker.base.jre}</image>
+                    </from>
+                    <to>
+                        <!-- 如果是阿里云的容器镜像仓库，则使用容器的配置 前缀/命名空间/仓库名 -->
+                        <image>${docker.registry}/${docker.space}/${docker.warehouse}</image>
+                        <tags>
+                            <!--指定包名 + 版本号即可-->
+                            <image>${artifactId}-${version}</image>
+                        </tags>
+                    </to>
+                    <!--容器相关的属性-->
+                    <container>
+                        <!--jvm内存参数-->
+                        <jvmFlags>
+                            <jvmFlag>-Xms512m</jvmFlag>
+                            <jvmFlag>-Xmx512m</jvmFlag>
+                        </jvmFlags>
+                        <!--要暴露的端口-->
+                        <ports>
+                            <port>12080</port>
+                        </ports>
+                        <!--使用该参数将镜像的创建时间与系统时间一致-->
+                        <!--<useCurrentTimestamp>true</useCurrentTimestamp>-->
+                        <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
+                        <!--解决Could not find or load main class ${start-class} -->
+                        <mainClass>com.ruoyi.gateway.RuoYiGatewayApplication</mainClass>
+                        <!-- 设置时区  -->
+                        <environment>
+                            <TZ>Asia/Shanghai</TZ>
+                        </environment>
+                    </container>
+                    <allowInsecureRegistries>true</allowInsecureRegistries>
+                </configuration>
+                <!-- 解决maven工程是父子结构的  mvn compile-->
+                <!-- 把 jib 绑定到 Maven 命令中-->
+                <executions>
+                    <execution>
+                        <phase>package</phase> <!-- 表示执行mvn package命令的时候就会自动构建镜像了-->
+                        <goals>
+                            <goal>${jib.key}</goal><!-- 表示执行的jib命令  是dockerBuild 还是build-->
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>