Merge branch 'master' of http://47.100.114.196:3001/jwy/aeon_sender

Dockerfile

@@ -1,4 +1,8 @@
-FROM registry.ap-northeast-1.aliyuncs.com/southwave/jdk17-template:latest
+# FROM registry.ap-northeast-1.aliyuncs.com/southwave/jdk17-template:latest
+FROM amazoncorretto:17-alpine
+# 安装 fontconfig 和 DejaVu 字体 (这是一个通用且免费的字体包)
+RUN apk --no-cache add fontconfig ttf-dejavu
+
 WORKDIR /app
 COPY target/data-center-sender.jar  app.jar
 EXPOSE 8201

pom.xml

@@ -457,7 +457,28 @@
                     </authConfig>
                     <images>
                         <image>
-                            <name>${aws.ecr.registry}/aeon-prod/${aws.ecr.repositoryProd}:latest</name>
+                            <name>${aws.ecr.registry}/${aws.ecr.repository}:latest</name>
+                            <registry>${aws.ecr.registry}</registry>
+                            <build>
+                                <dockerFile>${project.basedir}/Dockerfile</dockerFile>
+                            </build>
+                        </image>
+                    </images>
+                </configuration>
+            </plugin>
+            <!--         测试环境  -->
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.38.1</version>
+                <configuration>
+                    <authConfig>
+                        <username>AKIAQNYBBSGDVT3VF4ON</username>
+                        <password>DEhPMTHAIsKK7L2klURQrmMe3r2Tqgbaa6z2FYQu</password>
+                    </authConfig>
+                    <images>
+                        <image>
+                            <name>${aws.ecr.registryTest}/aeon/${aws.ecr.repository}:latest</name>
                             <registry>${aws.ecr.registry}</registry>
                             <build>
                                 <dockerFile>${project.basedir}/Dockerfile</dockerFile>
@@ -466,27 +487,6 @@
                     </images>
                 </configuration>
             </plugin>
-<!--            &lt;!&ndash;         测试环境  &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>io.fabric8</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>0.38.1</version>-->
-<!--                <configuration>-->
-<!--                    <authConfig>-->
-<!--                        <username>AKIAQNYBBSGDVT3VF4ON</username>-->
-<!--                        <password>DEhPMTHAIsKK7L2klURQrmMe3r2Tqgbaa6z2FYQu</password>-->
-<!--                    </authConfig>-->
-<!--                    <images>-->
-<!--                        <image>-->
-<!--                            <name>${aws.ecr.registryTest}/aeon/${aws.ecr.repository}:latest</name>-->
-<!--                            <registry>${aws.ecr.registry}</registry>-->
-<!--                            <build>-->
-<!--                                <dockerFile>${project.basedir}/Dockerfile</dockerFile>-->
-<!--                            </build>-->
-<!--                        </image>-->
-<!--                    </images>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
 
 
         </plugins>