From 8ca5f73eec87ce183ae852c766efc45a07ec21ec Mon Sep 17 00:00:00 2001
From: zhczyx <zhczyx@163.com>
Date: Fri, 17 Apr 2026 22:17:15 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0Dockerfile=E5=92=8Cp?=
 =?UTF-8?q?om.xml=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改mvnw文件权限为可执行
- 添加.java-version文件指定Java 17
- 优化Dockerfile中的包管理命令
- 切换pom.xml中的docker插件配置为测试环境
---
 .java-version |  1 +
 Dockerfile    |  6 ++++--
 mvnw          |  0
 pom.xml       | 44 ++++++++++++++++++++++----------------------
 4 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 .java-version
 mode change 100644 => 100755 mvnw

diff --git a/.java-version b/.java-version
new file mode 100644
index 0000000..98d9bcb
--- /dev/null
+++ b/.java-version
@@ -0,0 +1 @@
+17
diff --git a/Dockerfile b/Dockerfile
index e8a55f3..5015b5c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,9 @@
 # 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
+# 更新系统包并安装 fontconfig 和 DejaVu 字体 (这是一个通用且免费的字体包)
+RUN apk --no-cache update && \
+    apk --no-cache upgrade && \
+    apk --no-cache add fontconfig ttf-dejavu
 
 WORKDIR /app
 COPY target/data-center-sender.jar  app.jar
diff --git a/mvnw b/mvnw
old mode 100644
new mode 100755
diff --git a/pom.xml b/pom.xml
index d661247..624d8b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -470,7 +470,7 @@
             </plugin>
 
 <!--         正式环境  -->
-            <plugin>
+            <!-- <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
                 <version>0.38.1</version>
@@ -489,28 +489,28 @@
                         </image>
                     </images>
                 </configuration>
-            </plugin>
+            </plugin> -->
 <!--            &lt;!&ndash;         测试环境  &ndash;&gt;-->
-<!--            <plugin>-->
-<!--                <groupId>io.fabric8</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>0.38.1</version>-->
-<!--                <configuration>-->
-<!--                    <authConfig>-->
-<!--                        <username>AKIAVSKFRQDPNWHJDSHL</username>-->
-<!--                        <password>DqGyOiVFKI50/Ix+cjvj25vPL2tC7NJrJ7fqzn/g</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>-->
+           <plugin>
+               <groupId>io.fabric8</groupId>
+               <artifactId>docker-maven-plugin</artifactId>
+               <version>0.38.1</version>
+               <configuration>
+                   <authConfig>
+                       <username>AKIAVSKFRQDPNWHJDSHL</username>
+                       <password>DqGyOiVFKI50/Ix+cjvj25vPL2tC7NJrJ7fqzn/g</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>