From 5ed8b2a24b9d9cdbe641a7bad14d633f6894b1d7 Mon Sep 17 00:00:00 2001
From: Doubleyin <953994191@qq.com>
Date: Sun, 28 Sep 2025 03:11:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=B0=9D=E8=AF=95deepseek?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yml |  3 ++-
 pom.xml                     | 32 ++++++++++++++++----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index a023f39..c27663b 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -58,7 +58,8 @@ jobs:
         run: |
           # 使用 Jib 直接构建到本地 Docker 守护进程
           # 这会利用 Jib 的分层缓存机制，后续构建会更快
-          mvn compile jib:dockerBuild -DskipTests \
+          mvn compile jib:dockerBuild -o -DskipTests \
+            -Djib.allowInsecureRegistries=true\
             -Djib.to.image=light-delivery-app:latest \
             -Djib.container.ports=8080,8443 \
             -Djib.container.environment.SPRING_PROFILES_ACTIVE=prod \
diff --git a/pom.xml b/pom.xml
index 5b7c824..7fb8c5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,7 +170,8 @@
                 <version>3.3.1</version>
                 <configuration>
                     <from>
-                        <image>docker://openjdk:17-jdk-slim</image> <!-- 关键修改1: 使用 docker:// 前缀明确指向本地Daemon -->
+                        <!-- 明确指定使用本地 Docker 守护进程 -->
+                        <image>docker://openjdk:17-jdk-slim</image>
                     </from>
                     <to>
                         <image>light-delivery-app</image>
@@ -188,26 +189,25 @@
                             <SPRING_PROFILES_ACTIVE>prod</SPRING_PROFILES_ACTIVE>
                         </environment>
                         <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
+                        <!-- 添加主类配置 -->
                         <mainClass>com.light.delivery.LightApplication</mainClass>
                     </container>
-                    <!-- 关键修改2: 强化离线模式配置 -->
+                    <!-- 强化离线配置 -->
                     <offline>true</offline>
+                    <!-- 不验证远程仓库 -->
                     <allowInsecureRegistries>true</allowInsecureRegistries>
+                    <!-- 不拉取父镜像 -->
+                    <pullParent>false</pullParent>
+                    <!-- 镜像标签配置 -->
+                    <outputPaths>
+                        <tar>${project.build.directory}/jib-image.tar</tar>
+                    </outputPaths>
+                    <!-- 优化CI/CD构建 -->
+                    <containerizingMode>packaged</containerizingMode>
+                    <!-- 其他优化配置 -->
+                    <skip>false</skip>
+                    <useOnlyProjectProperties>true</useOnlyProjectProperties>
                 </configuration>
-                <!-- 关键修改3: 为jib目标绑定离线模式配置 -->
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                        <configuration>
-                            <systemProperties>
-                                <jib.allowInsecureRegistries>true</jib.allowInsecureRegistries>
-                            </systemProperties>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>