From 9bf0fb35683effcaacd5a69902dd2c18ccbb0140 Mon Sep 17 00:00:00 2001
From: bichangxiong <3057647414@qq.com>
Date: Thu, 14 Aug 2025 15:42:10 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/dev?=
=?UTF-8?q?.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitea/workflows/dev.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml
index 3270cd20..33320f81 100644
--- a/.gitea/workflows/dev.yml
+++ b/.gitea/workflows/dev.yml
@@ -195,7 +195,7 @@ jobs:
uses: http://git.missmoc.top/mocheng/build-push-action@v5
with:
context: "${GITHUB_WORKSPACE}"
- file: ${{ github.workspace }}/${{ matrix.service }}/Dockerfile
+ file: ${GITHUB_WORKSPACE}/${{ matrix.service }}/Dockerfile
tags: 172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest
# tags: ${{ secrets.REGISTRY_URL }}/by2025/$(echo ${{ matrix.service }} | tr 'A-Z' 'a-z'):${{ github.sha }}
# tags: ${{ secrets.REGISTRY_URL }}/by2025/${{ matrix.service }}:2.0.4
From 8bbe92db4e8f8c6dbaca8d6023af979a6d1b026a Mon Sep 17 00:00:00 2001
From: bichangxiong <3057647414@qq.com>
Date: Thu, 14 Aug 2025 15:50:05 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/dev?=
=?UTF-8?q?.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitea/workflows/dev.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml
index 33320f81..cf53dcee 100644
--- a/.gitea/workflows/dev.yml
+++ b/.gitea/workflows/dev.yml
@@ -194,8 +194,8 @@ jobs:
- name: 构建并推送Docker镜像（仅推送镜像，不上传JAR）
uses: http://git.missmoc.top/mocheng/build-push-action@v5
with:
- context: "${GITHUB_WORKSPACE}"
- file: ${GITHUB_WORKSPACE}/${{ matrix.service }}/Dockerfile
+ context: "${{ github.workspace }}"
+ file: ${{ github.workspace }}/${{ matrix.service }}/Dockerfile
tags: 172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest
# tags: ${{ secrets.REGISTRY_URL }}/by2025/$(echo ${{ matrix.service }} | tr 'A-Z' 'a-z'):${{ github.sha }}
# tags: ${{ secrets.REGISTRY_URL }}/by2025/${{ matrix.service }}:2.0.4
From 6410e15b88c6fe8af89a12cef51ef88c6db30790 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 15:57:04 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?=
=?UTF-8?q?=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-auth/Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile
index 8555931b..a1914e71 100644
--- a/ruoyi-auth/Dockerfile
+++ b/ruoyi-auth/Dockerfile
@@ -1,5 +1,6 @@
# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
-FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
+#FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
+FROM registry.cn-hangzhou.aliyuncs.com/aliyun_openjdk/openjdk:17-jdk-slim
#FROM bellsoft/liberica-openjdk-debian:21.0.5-cds
#FROM findepi/graalvm:java17-native
From 8b9e05351706194590d6b4939e1788643860cb9b Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 16:28:30 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?=
=?UTF-8?q?=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitea/workflows/dev.yml | 62 +++++++++++++++++++++++++++++++---------
1 file changed, 49 insertions(+), 13 deletions(-)
diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml
index cf53dcee..51605f57 100644
--- a/.gitea/workflows/dev.yml
+++ b/.gitea/workflows/dev.yml
@@ -15,7 +15,7 @@ jobs:
run: |
export JAVA_HOME="/java17/java17"
export MAVEN_HOME="/maven/apache-maven-3.9.11"
-
+
if [ ! -f "$JAVA_HOME/bin/java" ]; then
echo "错误：JDK可执行文件不存在于 $JAVA_HOME/bin/java"
exit 1
@@ -24,12 +24,12 @@ jobs:
echo "错误：Maven可执行文件不存在于 $MAVEN_HOME/bin/mvn"
exit 1
fi
-
+
echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
echo "$JAVA_HOME/bin" >> $GITHUB_PATH
echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV
echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
-
+
"$JAVA_HOME/bin/java" -version
"$MAVEN_HOME/bin/mvn" -v
@@ -68,7 +68,7 @@ jobs:
echo "错误：主POM文件不存在"
exit 1
fi
-
+
retries=3
count=0
until "$MAVEN_HOME/bin/mvn" clean install -U -DskipTests -f "$MAIN_POM_ABSOLUTE_PATH"; do
@@ -105,14 +105,14 @@ jobs:
# "ruoyi-common-alibaba-bom"
# "ruoyi-api-bom"
# )
-
+
# for module in "${COMMON_MODULES[@]}"; do
# MODULE_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${module}/pom.xml"
# if [ ! -f "$MODULE_POM_ABSOLUTE_PATH" ]; then
# echo "警告：模块 $module 不存在，跳过"
# continue
# fi
-
+
# retries=3
# count=0
# until "$MAVEN_HOME/bin/mvn" clean compile install -U -DskipTests -f "$MODULE_POM_ABSOLUTE_PATH"; do
@@ -166,7 +166,7 @@ jobs:
echo "错误：服务 $SERVICE_NAME 的POM文件不存在"
exit 1
fi
-
+
"$MAVEN_HOME/bin/mvn" clean package -U -DskipTests -f "$SERVICE_POM_ABSOLUTE_PATH"
- name: 配置Docker Buildx
@@ -184,22 +184,58 @@ jobs:
run: |
SERVICE_NAME="${{ matrix.service }}"
DOCKERFILE_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${SERVICE_NAME}/Dockerfile"
-
+
if [ -f "$DOCKERFILE_ABSOLUTE_PATH" ]; then
echo "dockerfile_path=$DOCKERFILE_ABSOLUTE_PATH" >> $GITHUB_OUTPUT
else
echo "dockerfile_path=${GITHUB_WORKSPACE}/Dockerfile" >> $GITHUB_OUTPUT
fi
+ # - name: 构建并推送Docker镜像（仅推送镜像，不上传JAR）
+ # uses: http://git.missmoc.top/mocheng/build-push-action@v5
+ # with:
+ # context: "${{ github.workspace }}"
+ # file: ${{ github.workspace }}/${{ matrix.service }}/Dockerfile
+ # tags: 172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest
+ # # tags: ${{ secrets.REGISTRY_URL }}/by2025/$(echo ${{ matrix.service }} | tr 'A-Z' 'a-z'):${{ github.sha }}
+ # # tags: ${{ secrets.REGISTRY_URL }}/by2025/${{ matrix.service }}:2.0.4
+ # push: true
+ # cache-from: type=gha
+ # cache-to: type=gha,mode=max
+ #
- name: 构建并推送Docker镜像（仅推送镜像，不上传JAR）
uses: http://git.missmoc.top/mocheng/build-push-action@v5
with:
+ # 指定构建上下文为当前工作目录
context: "${{ github.workspace }}"
- file: ${{ github.workspace }}/${{ matrix.service }}/Dockerfile
- tags: 172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest
- # tags: ${{ secrets.REGISTRY_URL }}/by2025/$(echo ${{ matrix.service }} | tr 'A-Z' 'a-z'):${{ github.sha }}
- # tags: ${{ secrets.REGISTRY_URL }}/by2025/${{ matrix.service }}:2.0.4
+
+ # 指定Dockerfile路径，基于矩阵中的服务名称
+ file: "${{ github.workspace }}/${{ matrix.service }}/Dockerfile"
+
+ # 镜像标签，推送到私有仓库
+ tags: "172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest"
+
+ # 启用镜像推送
push: true
+
+ # 使用GitHub Actions缓存加速构建
cache-from: type=gha
cache-to: type=gha,mode=max
-
\ No newline at end of file
+
+ # 新增：设置镜像拉取超时时间（秒）
+ pull-timeout: 300
+
+ # 新增：构建参数，可在Dockerfile中使用ARG引用
+ build-args: |
+ # 示例：使用国内镜像源加速基础镜像拉取
+ BASE_IMAGE_MIRROR=registry.cn-hangzhou.aliyuncs.com
+
+ # 新增：配置Docker守护进程的镜像加速源
+ daemon-config: |
+ {
+ "registry-mirrors": [
+ "https://registry.cn-hangzhou.aliyuncs.com",
+ "https://hub-mirror.c.163.com",
+ "https://mirror.baidubce.com"
+ ]
+ }
From d9264b65ab02a4dc160942d37261363f96e04774 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 16:44:11 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?=
=?UTF-8?q?=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitea/workflows/dev.yml | 45 ++++------------------------------------
ruoyi-auth/Dockerfile | 3 ++-
2 files changed, 6 insertions(+), 42 deletions(-)
diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml
index 51605f57..5a5e5464 100644
--- a/.gitea/workflows/dev.yml
+++ b/.gitea/workflows/dev.yml
@@ -191,51 +191,14 @@ jobs:
echo "dockerfile_path=${GITHUB_WORKSPACE}/Dockerfile" >> $GITHUB_OUTPUT
fi
- # - name: 构建并推送Docker镜像（仅推送镜像，不上传JAR）
- # uses: http://git.missmoc.top/mocheng/build-push-action@v5
- # with:
- # context: "${{ github.workspace }}"
- # file: ${{ github.workspace }}/${{ matrix.service }}/Dockerfile
- # tags: 172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest
- # # tags: ${{ secrets.REGISTRY_URL }}/by2025/$(echo ${{ matrix.service }} | tr 'A-Z' 'a-z'):${{ github.sha }}
- # # tags: ${{ secrets.REGISTRY_URL }}/by2025/${{ matrix.service }}:2.0.4
- # push: true
- # cache-from: type=gha
- # cache-to: type=gha,mode=max
- #
- name: 构建并推送Docker镜像（仅推送镜像，不上传JAR）
uses: http://git.missmoc.top/mocheng/build-push-action@v5
with:
- # 指定构建上下文为当前工作目录
context: "${{ github.workspace }}"
-
- # 指定Dockerfile路径，基于矩阵中的服务名称
- file: "${{ github.workspace }}/${{ matrix.service }}/Dockerfile"
-
- # 镜像标签，推送到私有仓库
- tags: "172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest"
-
- # 启用镜像推送
+ file: ${{ github.workspace }}/${{ matrix.service }}/Dockerfile
+ tags: 172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest
+ # tags: ${{ secrets.REGISTRY_URL }}/by2025/$(echo ${{ matrix.service }} | tr 'A-Z' 'a-z'):${{ github.sha }}
+ # tags: ${{ secrets.REGISTRY_URL }}/by2025/${{ matrix.service }}:2.0.4
push: true
-
- # 使用GitHub Actions缓存加速构建
cache-from: type=gha
cache-to: type=gha,mode=max
-
- # 新增：设置镜像拉取超时时间（秒）
- pull-timeout: 300
-
- # 新增：构建参数，可在Dockerfile中使用ARG引用
- build-args: |
- # 示例：使用国内镜像源加速基础镜像拉取
- BASE_IMAGE_MIRROR=registry.cn-hangzhou.aliyuncs.com
-
- # 新增：配置Docker守护进程的镜像加速源
- daemon-config: |
- {
- "registry-mirrors": [
- "https://registry.cn-hangzhou.aliyuncs.com",
- "https://hub-mirror.c.163.com",
- "https://mirror.baidubce.com"
- ]
- }
diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile
index a1914e71..716df43d 100644
--- a/ruoyi-auth/Dockerfile
+++ b/ruoyi-auth/Dockerfile
@@ -1,7 +1,8 @@
# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
#FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
-FROM registry.cn-hangzhou.aliyuncs.com/aliyun_openjdk/openjdk:17-jdk-slim
+#FROM registry.cn-hangzhou.aliyuncs.com/aliyun_openjdk/openjdk:17-jdk-slim
#FROM bellsoft/liberica-openjdk-debian:21.0.5-cds
+FROM 172.100.10.45:3000/by2025/base-images/liberica-openjdk-debian:17.0.11-cds
#FROM findepi/graalvm:java17-native
LABEL maintainer="Lion Li"
From a8b21eeaa3d3c2fea082fc64d48baefcd77f8373 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 16:52:36 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?=
=?UTF-8?q?=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitea/workflows/dev.yml | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml
index 5a5e5464..1931e454 100644
--- a/.gitea/workflows/dev.yml
+++ b/.gitea/workflows/dev.yml
@@ -195,10 +195,26 @@ jobs:
uses: http://git.missmoc.top/mocheng/build-push-action@v5
with:
context: "${{ github.workspace }}"
- file: ${{ github.workspace }}/${{ matrix.service }}/Dockerfile
- tags: 172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest
- # tags: ${{ secrets.REGISTRY_URL }}/by2025/$(echo ${{ matrix.service }} | tr 'A-Z' 'a-z'):${{ github.sha }}
- # tags: ${{ secrets.REGISTRY_URL }}/by2025/${{ matrix.service }}:2.0.4
+ file: "${{ github.workspace }}/${{ matrix.service }}/Dockerfile"
+ tags: "172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest"
push: true
cache-from: type=gha
cache-to: type=gha,mode=max
+
+ # 关键配置：允许该仓库使用HTTP
+ daemon-config: |
+ {
+ "insecure-registries": ["172.100.10.45:3000"]
+ }
+
+ # 确保buildx使用正确的网络配置
+ driver-opts: |
+ network=host
+# context: "${{ github.workspace }}"
+# file: ${{ github.workspace }}/${{ matrix.service }}/Dockerfile
+# tags: 172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest
+# # tags: ${{ secrets.REGISTRY_URL }}/by2025/$(echo ${{ matrix.service }} | tr 'A-Z' 'a-z'):${{ github.sha }}
+# # tags: ${{ secrets.REGISTRY_URL }}/by2025/${{ matrix.service }}:2.0.4
+# push: true
+# cache-from: type=gha
+# cache-to: type=gha,mode=max
From ee0664c23b4a5ccb5251f12a1607eea46a255cb4 Mon Sep 17 00:00:00 2001
From: bichangxiong <3057647414@qq.com>
Date: Thu, 14 Aug 2025 16:59:00 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/dev?=
=?UTF-8?q?.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitea/workflows/dev.yml | 156 +++++++++++++++++++--------------------
1 file changed, 74 insertions(+), 82 deletions(-)
diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml
index 1931e454..00c725ec 100644
--- a/.gitea/workflows/dev.yml
+++ b/.gitea/workflows/dev.yml
@@ -80,50 +80,50 @@ jobs:
sleep 10
done
- # build-common-modules:
- # needs: build-parent-pom
- # runs-on: ubuntu
- # steps:
- # - name: 拉取代码仓库
- # uses: http://git.missmoc.top/mocheng/checkout@v4
+ build-common-modules:
+ needs: build-parent-pom
+ runs-on: ubuntu
+ steps:
+ - name: 拉取代码仓库
+ uses: http://git.missmoc.top/mocheng/checkout@v4
- # - name: 配置环境变量
- # run: |
- # export JAVA_HOME="/java17/java17"
- # export MAVEN_HOME="/maven/apache-maven-3.9.11"
- # echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
- # echo "$JAVA_HOME/bin" >> $GITHUB_PATH
- # echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV
- # echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
+ - name: 配置环境变量
+ run: |
+ export JAVA_HOME="/java17/java17"
+ export MAVEN_HOME="/maven/apache-maven-3.9.11"
+ echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
+ echo "$JAVA_HOME/bin" >> $GITHUB_PATH
+ echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV
+ echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
- # - name: 构建通用模块（仅本地使用，不上传）
- # run: |
- # COMMON_MODULES=(
- # "ruoyi-common"
- # "ruoyi-api"
- # "ruoyi-common-bom"
- # "ruoyi-common-alibaba-bom"
- # "ruoyi-api-bom"
- # )
+ - name: 构建通用模块（仅本地使用，不上传）
+ run: |
+ COMMON_MODULES=(
+ "ruoyi-common"
+ "ruoyi-api"
+ "ruoyi-common-bom"
+ "ruoyi-common-alibaba-bom"
+ "ruoyi-api-bom"
+ )
- # for module in "${COMMON_MODULES[@]}"; do
- # MODULE_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${module}/pom.xml"
- # if [ ! -f "$MODULE_POM_ABSOLUTE_PATH" ]; then
- # echo "警告：模块 $module 不存在，跳过"
- # continue
- # fi
+ for module in "${COMMON_MODULES[@]}"; do
+ MODULE_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${module}/pom.xml"
+ if [ ! -f "$MODULE_POM_ABSOLUTE_PATH" ]; then
+ echo "警告：模块 $module 不存在，跳过"
+ continue
+ fi
- # retries=3
- # count=0
- # until "$MAVEN_HOME/bin/mvn" clean compile install -U -DskipTests -f "$MODULE_POM_ABSOLUTE_PATH"; do
- # count=$((count + 1))
- # if [ $count -ge $retries ]; then
- # echo "错误：模块 $module 构建失败"
- # exit 1
- # fi
- # sleep 10
- # done
- # done
+ retries=3
+ count=0
+ until "$MAVEN_HOME/bin/mvn" clean compile install -U -DskipTests -f "$MODULE_POM_ABSOLUTE_PATH"; do
+ count=$((count + 1))
+ if [ $count -ge $retries ]; then
+ echo "错误：模块 $module 构建失败"
+ exit 1
+ fi
+ sleep 10
+ done
+ done
build-and-push-services:
needs: build-common-modules
@@ -169,52 +169,44 @@ jobs:
"$MAVEN_HOME/bin/mvn" clean package -U -DskipTests -f "$SERVICE_POM_ABSOLUTE_PATH"
- - name: 配置Docker Buildx
- uses: http://git.missmoc.top/mocheng/setup-buildx-action@v3
+ - name: 配置Docker允许HTTP私有仓库
+ run: |
+ # 配置Docker守护进程接受HTTP私有仓库
+ sudo mkdir -p /etc/docker
+ echo '{ "insecure-registries": ["172.100.10.45:3000"] }' | sudo tee /etc/docker/daemon.json
+ # 重启Docker使配置生效
+ sudo systemctl restart docker
+ # 验证配置
+ docker info | grep -A 10 "Insecure Registries"
- - name: 登录到容器仓库
- uses: http://git.missmoc.top/mocheng/login-action@v3
- with:
- registry: ${{ secrets.REGISTRY_URL }}
- username: ${{ secrets.REGISTRY_USER }}
- password: ${{ secrets.REGISTRY_PASS }}
+ - name: 登录到私有容器仓库
+ run: |
+ echo "${{ secrets.REGISTRY_PASS }}" | docker login ${{ secrets.REGISTRY_URL }} -u ${{ secrets.REGISTRY_USER }} --password-stdin
- - name: 确定Dockerfile路径
- id: dockerfile-path
+ - name: 构建Docker镜像
run: |
SERVICE_NAME="${{ matrix.service }}"
- DOCKERFILE_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${SERVICE_NAME}/Dockerfile"
-
- if [ -f "$DOCKERFILE_ABSOLUTE_PATH" ]; then
- echo "dockerfile_path=$DOCKERFILE_ABSOLUTE_PATH" >> $GITHUB_OUTPUT
+ # 替换路径中的斜杠为连字符，避免镜像标签中的路径问题
+ SANITIZED_SERVICE_NAME=$(echo "$SERVICE_NAME" | tr '/' '-')
+ IMAGE_TAG="172.100.10.45:3000/by2025/smartparks/${SANITIZED_SERVICE_NAME}:latest"
+
+ # 确定Dockerfile路径
+ if [ -f "${GITHUB_WORKSPACE}/${SERVICE_NAME}/Dockerfile" ]; then
+ DOCKERFILE_PATH="${GITHUB_WORKSPACE}/${SERVICE_NAME}/Dockerfile"
else
- echo "dockerfile_path=${GITHUB_WORKSPACE}/Dockerfile" >> $GITHUB_OUTPUT
+ DOCKERFILE_PATH="${GITHUB_WORKSPACE}/Dockerfile"
fi
+
+ # 使用原生docker build命令构建镜像
+ docker build -t "$IMAGE_TAG" -f "$DOCKERFILE_PATH" "${GITHUB_WORKSPACE}"
+
+ # 保存镜像标签供后续步骤使用
+ echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
- - name: 构建并推送Docker镜像（仅推送镜像，不上传JAR）
- uses: http://git.missmoc.top/mocheng/build-push-action@v5
- with:
- context: "${{ github.workspace }}"
- file: "${{ github.workspace }}/${{ matrix.service }}/Dockerfile"
- tags: "172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest"
- push: true
- cache-from: type=gha
- cache-to: type=gha,mode=max
-
- # 关键配置：允许该仓库使用HTTP
- daemon-config: |
- {
- "insecure-registries": ["172.100.10.45:3000"]
- }
-
- # 确保buildx使用正确的网络配置
- driver-opts: |
- network=host
-# context: "${{ github.workspace }}"
-# file: ${{ github.workspace }}/${{ matrix.service }}/Dockerfile
-# tags: 172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest
-# # tags: ${{ secrets.REGISTRY_URL }}/by2025/$(echo ${{ matrix.service }} | tr 'A-Z' 'a-z'):${{ github.sha }}
-# # tags: ${{ secrets.REGISTRY_URL }}/by2025/${{ matrix.service }}:2.0.4
-# push: true
-# cache-from: type=gha
-# cache-to: type=gha,mode=max
+ - name: 推送Docker镜像到私有仓库
+ run: |
+ # 推送镜像
+ docker push "$IMAGE_TAG"
+
+ # 登出仓库
+ docker logout ${{ secrets.REGISTRY_URL }}
From 61883eff213e2e57747409cf9df30a3f14ff3049 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 17:08:31 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?=
=?UTF-8?q?=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitea/workflows/dev.yml | 339 ++++++++++++++++++++++++++++++++-------
1 file changed, 283 insertions(+), 56 deletions(-)
diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml
index 1931e454..7947582b 100644
--- a/.gitea/workflows/dev.yml
+++ b/.gitea/workflows/dev.yml
@@ -1,3 +1,225 @@
+#run-name: ${{ gitea.actor }} 构建镜像并推送（不含JAR依赖上传）🚀
+#on:
+# push:
+# branches:
+# - master
+#
+#jobs:
+# build-parent-pom:
+# runs-on: ubuntu
+# steps:
+# - name: 拉取代码仓库
+# uses: http://git.missmoc.top/mocheng/checkout@v4
+#
+# - name: 配置环境变量（绝对路径）
+# run: |
+# export JAVA_HOME="/java17/java17"
+# export MAVEN_HOME="/maven/apache-maven-3.9.11"
+#
+# if [ ! -f "$JAVA_HOME/bin/java" ]; then
+# echo "错误：JDK可执行文件不存在于 $JAVA_HOME/bin/java"
+# exit 1
+# fi
+# if [ ! -f "$MAVEN_HOME/bin/mvn" ]; then
+# echo "错误：Maven可执行文件不存在于 $MAVEN_HOME/bin/mvn"
+# exit 1
+# fi
+#
+# echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
+# echo "$JAVA_HOME/bin" >> $GITHUB_PATH
+# echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV
+# echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
+#
+# "$JAVA_HOME/bin/java" -version
+# "$MAVEN_HOME/bin/mvn" -v
+#
+# - name: 配置Maven仓库
+# run: |
+# mkdir -p ~/.m2
+# cat > ~/.m2/settings.xml << EOF
+#
+#
+# /root/.m2/repository
+#
+#
+# multi-repo
+#
+#
+# local-repo
+# file:///root/.m2/repository
+#
+#
+# aliyun-public
+# https://maven.aliyun.com/repository/public
+#
+#
+#
+#
+#
+# multi-repo
+#
+#
+# EOF
+#
+# - name: 构建主POM（仅本地安装，不上传）
+# run: |
+# MAIN_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/pom.xml"
+# if [ ! -f "$MAIN_POM_ABSOLUTE_PATH" ]; then
+# echo "错误：主POM文件不存在"
+# exit 1
+# fi
+#
+# retries=3
+# count=0
+# until "$MAVEN_HOME/bin/mvn" clean install -U -DskipTests -f "$MAIN_POM_ABSOLUTE_PATH"; do
+# count=$((count + 1))
+# if [ $count -ge $retries ]; then
+# echo "错误：主POM构建失败"
+# exit 1
+# fi
+# sleep 10
+# done
+#
+# # build-common-modules:
+# # needs: build-parent-pom
+# # runs-on: ubuntu
+# # steps:
+# # - name: 拉取代码仓库
+# # uses: http://git.missmoc.top/mocheng/checkout@v4
+#
+# # - name: 配置环境变量
+# # run: |
+# # export JAVA_HOME="/java17/java17"
+# # export MAVEN_HOME="/maven/apache-maven-3.9.11"
+# # echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
+# # echo "$JAVA_HOME/bin" >> $GITHUB_PATH
+# # echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV
+# # echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
+#
+# # - name: 构建通用模块（仅本地使用，不上传）
+# # run: |
+# # COMMON_MODULES=(
+# # "ruoyi-common"
+# # "ruoyi-api"
+# # "ruoyi-common-bom"
+# # "ruoyi-common-alibaba-bom"
+# # "ruoyi-api-bom"
+# # )
+#
+# # for module in "${COMMON_MODULES[@]}"; do
+# # MODULE_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${module}/pom.xml"
+# # if [ ! -f "$MODULE_POM_ABSOLUTE_PATH" ]; then
+# # echo "警告：模块 $module 不存在，跳过"
+# # continue
+# # fi
+#
+# # retries=3
+# # count=0
+# # until "$MAVEN_HOME/bin/mvn" clean compile install -U -DskipTests -f "$MODULE_POM_ABSOLUTE_PATH"; do
+# # count=$((count + 1))
+# # if [ $count -ge $retries ]; then
+# # echo "错误：模块 $module 构建失败"
+# # exit 1
+# # fi
+# # sleep 10
+# # done
+# # done
+#
+# build-and-push-services:
+# needs: build-common-modules
+# runs-on: ubuntu
+# strategy:
+# matrix:
+# service:
+# - ruoyi-auth
+# - ruoyi-gateway
+# - ruoyi-modules/Property
+# - ruoyi-modules/ruoyi-gen
+# - ruoyi-modules/ruoyi-job
+# - ruoyi-modules/ruoyi-resource
+# - ruoyi-modules/ruoyi-system
+# - ruoyi-modules/ruoyi-workflow
+# - ruoyi-modules/Sis
+# - ruoyi-visual/ruoyi-monitor
+# - ruoyi-visual/ruoyi-nacos
+# - ruoyi-seata-server
+# - ruoyi-sentinel-dashboard
+# - ruoyi-snailjob-server
+# steps:
+# - name: 拉取代码仓库
+# uses: http://git.missmoc.top/mocheng/checkout@v4
+#
+# - name: 配置环境变量
+# run: |
+# export JAVA_HOME="/java17/java17"
+# export MAVEN_HOME="/maven/apache-maven-3.9.11"
+# echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
+# echo "$JAVA_HOME/bin" >> $GITHUB_PATH
+# echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV
+# echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
+#
+# - name: 构建服务模块
+# run: |
+# SERVICE_NAME="${{ matrix.service }}"
+# SERVICE_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${SERVICE_NAME}/pom.xml"
+# if [ ! -f "$SERVICE_POM_ABSOLUTE_PATH" ]; then
+# echo "错误：服务 $SERVICE_NAME 的POM文件不存在"
+# exit 1
+# fi
+#
+# "$MAVEN_HOME/bin/mvn" clean package -U -DskipTests -f "$SERVICE_POM_ABSOLUTE_PATH"
+#
+# - name: 配置Docker Buildx
+# uses: http://git.missmoc.top/mocheng/setup-buildx-action@v3
+#
+# - name: 登录到容器仓库
+# uses: http://git.missmoc.top/mocheng/login-action@v3
+# with:
+# registry: ${{ secrets.REGISTRY_URL }}
+# username: ${{ secrets.REGISTRY_USER }}
+# password: ${{ secrets.REGISTRY_PASS }}
+#
+# - name: 确定Dockerfile路径
+# id: dockerfile-path
+# run: |
+# SERVICE_NAME="${{ matrix.service }}"
+# DOCKERFILE_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${SERVICE_NAME}/Dockerfile"
+#
+# if [ -f "$DOCKERFILE_ABSOLUTE_PATH" ]; then
+# echo "dockerfile_path=$DOCKERFILE_ABSOLUTE_PATH" >> $GITHUB_OUTPUT
+# else
+# echo "dockerfile_path=${GITHUB_WORKSPACE}/Dockerfile" >> $GITHUB_OUTPUT
+# fi
+#
+# - name: 构建并推送Docker镜像（仅推送镜像，不上传JAR）
+# uses: http://git.missmoc.top/mocheng/build-push-action@v5
+# with:
+# context: "${{ github.workspace }}"
+# file: "${{ github.workspace }}/${{ matrix.service }}/Dockerfile"
+# tags: "172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest"
+# push: true
+# cache-from: type=gha
+# cache-to: type=gha,mode=max
+#
+# # 关键配置：允许该仓库使用HTTP
+# daemon-config: |
+# {
+# "insecure-registries": ["172.100.10.45:3000"]
+# }
+#
+# # 确保buildx使用正确的网络配置
+# driver-opts: |
+# network=host
+## context: "${{ github.workspace }}"
+## file: ${{ github.workspace }}/${{ matrix.service }}/Dockerfile
+## tags: 172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest
+## # tags: ${{ secrets.REGISTRY_URL }}/by2025/$(echo ${{ matrix.service }} | tr 'A-Z' 'a-z'):${{ github.sha }}
+## # tags: ${{ secrets.REGISTRY_URL }}/by2025/${{ matrix.service }}:2.0.4
+## push: true
+## cache-from: type=gha
+## cache-to: type=gha,mode=max
+
+
run-name: ${{ gitea.actor }} 构建镜像并推送（不含JAR依赖上传）🚀
on:
push:
@@ -80,50 +302,50 @@ jobs:
sleep 10
done
- # build-common-modules:
- # needs: build-parent-pom
- # runs-on: ubuntu
- # steps:
- # - name: 拉取代码仓库
- # uses: http://git.missmoc.top/mocheng/checkout@v4
+ build-common-modules:
+ needs: build-parent-pom
+ runs-on: ubuntu
+ steps:
+ - name: 拉取代码仓库
+ uses: http://git.missmoc.top/mocheng/checkout@v4
- # - name: 配置环境变量
- # run: |
- # export JAVA_HOME="/java17/java17"
- # export MAVEN_HOME="/maven/apache-maven-3.9.11"
- # echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
- # echo "$JAVA_HOME/bin" >> $GITHUB_PATH
- # echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV
- # echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
+ - name: 配置环境变量
+ run: |
+ export JAVA_HOME="/java17/java17"
+ export MAVEN_HOME="/maven/apache-maven-3.9.11"
+ echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
+ echo "$JAVA_HOME/bin" >> $GITHUB_PATH
+ echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV
+ echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
- # - name: 构建通用模块（仅本地使用，不上传）
- # run: |
- # COMMON_MODULES=(
- # "ruoyi-common"
- # "ruoyi-api"
- # "ruoyi-common-bom"
- # "ruoyi-common-alibaba-bom"
- # "ruoyi-api-bom"
- # )
+ - name: 构建通用模块（仅本地使用，不上传）
+ run: |
+ COMMON_MODULES=(
+ "ruoyi-common"
+ "ruoyi-api"
+ "ruoyi-common-bom"
+ "ruoyi-common-alibaba-bom"
+ "ruoyi-api-bom"
+ )
- # for module in "${COMMON_MODULES[@]}"; do
- # MODULE_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${module}/pom.xml"
- # if [ ! -f "$MODULE_POM_ABSOLUTE_PATH" ]; then
- # echo "警告：模块 $module 不存在，跳过"
- # continue
- # fi
+ for module in "${COMMON_MODULES[@]}"; do
+ MODULE_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${module}/pom.xml"
+ if [ ! -f "$MODULE_POM_ABSOLUTE_PATH" ]; then
+ echo "警告：模块 $module 不存在，跳过"
+ continue
+ fi
- # retries=3
- # count=0
- # until "$MAVEN_HOME/bin/mvn" clean compile install -U -DskipTests -f "$MODULE_POM_ABSOLUTE_PATH"; do
- # count=$((count + 1))
- # if [ $count -ge $retries ]; then
- # echo "错误：模块 $module 构建失败"
- # exit 1
- # fi
- # sleep 10
- # done
- # done
+ retries=3
+ count=0
+ until "$MAVEN_HOME/bin/mvn" clean compile install -U -DskipTests -f "$MODULE_POM_ABSOLUTE_PATH"; do
+ count=$((count + 1))
+ if [ $count -ge $retries ]; then
+ echo "错误：模块 $module 构建失败"
+ exit 1
+ fi
+ sleep 10
+ done
+ done
build-and-push-services:
needs: build-common-modules
@@ -169,8 +391,21 @@ jobs:
"$MAVEN_HOME/bin/mvn" clean package -U -DskipTests -f "$SERVICE_POM_ABSOLUTE_PATH"
- - name: 配置Docker Buildx
+ - name: 检查JAR文件是否存在
+ run: |
+ SERVICE_NAME="${{ matrix.service }}"
+ JAR_PATH="${GITHUB_WORKSPACE}/${SERVICE_NAME}/target/$(basename ${SERVICE_NAME}).jar"
+ if [ ! -f "$JAR_PATH" ]; then
+ echo "错误：JAR文件不存在 - $JAR_PATH"
+ echo "目标目录内容："
+ ls -l "${GITHUB_WORKSPACE}/${SERVICE_NAME}/target"
+ exit 1
+ fi
+
+ - name: 配置Docker Buildx（使用原生Docker驱动）
uses: http://git.missmoc.top/mocheng/setup-buildx-action@v3
+ with:
+ driver: docker # 避免容器化驱动的网络隔离问题
- name: 登录到容器仓库
uses: http://git.missmoc.top/mocheng/login-action@v3
@@ -194,27 +429,19 @@ jobs:
- name: 构建并推送Docker镜像（仅推送镜像，不上传JAR）
uses: http://git.missmoc.top/mocheng/build-push-action@v5
with:
- context: "${{ github.workspace }}"
- file: "${{ github.workspace }}/${{ matrix.service }}/Dockerfile"
- tags: "172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest"
+ # 使用服务模块目录作为构建上下文（确保能找到target/JAR）
+ context: "${{ github.workspace }}/${{ matrix.service }}"
+ file: "${{ steps.dockerfile-path.outputs.dockerfile_path }}"
+ # 处理镜像标签中的斜杠（避免格式错误）
+ tags: "172.100.10.45:3000/by2025/smartparks/$(echo ${{ matrix.service }} | tr '/' '-'):latest"
push: true
cache-from: type=gha
cache-to: type=gha,mode=max
-
- # 关键配置：允许该仓库使用HTTP
+ # 允许HTTP访问私有仓库
daemon-config: |
{
"insecure-registries": ["172.100.10.45:3000"]
}
-
- # 确保buildx使用正确的网络配置
+ # 禁用容器化网络，使用主机网络
driver-opts: |
network=host
-# context: "${{ github.workspace }}"
-# file: ${{ github.workspace }}/${{ matrix.service }}/Dockerfile
-# tags: 172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest
-# # tags: ${{ secrets.REGISTRY_URL }}/by2025/$(echo ${{ matrix.service }} | tr 'A-Z' 'a-z'):${{ github.sha }}
-# # tags: ${{ secrets.REGISTRY_URL }}/by2025/${{ matrix.service }}:2.0.4
-# push: true
-# cache-from: type=gha
-# cache-to: type=gha,mode=max
From 6a7a0a344f40d613dc69fb34bcab614b5caf41b9 Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 17:09:22 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?=
=?UTF-8?q?=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitea/workflows/dev.yml | 222 ---------------------------------------
1 file changed, 222 deletions(-)
diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml
index 7947582b..3b644811 100644
--- a/.gitea/workflows/dev.yml
+++ b/.gitea/workflows/dev.yml
@@ -1,225 +1,3 @@
-#run-name: ${{ gitea.actor }} 构建镜像并推送（不含JAR依赖上传）🚀
-#on:
-# push:
-# branches:
-# - master
-#
-#jobs:
-# build-parent-pom:
-# runs-on: ubuntu
-# steps:
-# - name: 拉取代码仓库
-# uses: http://git.missmoc.top/mocheng/checkout@v4
-#
-# - name: 配置环境变量（绝对路径）
-# run: |
-# export JAVA_HOME="/java17/java17"
-# export MAVEN_HOME="/maven/apache-maven-3.9.11"
-#
-# if [ ! -f "$JAVA_HOME/bin/java" ]; then
-# echo "错误：JDK可执行文件不存在于 $JAVA_HOME/bin/java"
-# exit 1
-# fi
-# if [ ! -f "$MAVEN_HOME/bin/mvn" ]; then
-# echo "错误：Maven可执行文件不存在于 $MAVEN_HOME/bin/mvn"
-# exit 1
-# fi
-#
-# echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
-# echo "$JAVA_HOME/bin" >> $GITHUB_PATH
-# echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV
-# echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
-#
-# "$JAVA_HOME/bin/java" -version
-# "$MAVEN_HOME/bin/mvn" -v
-#
-# - name: 配置Maven仓库
-# run: |
-# mkdir -p ~/.m2
-# cat > ~/.m2/settings.xml << EOF
-#
-#
-# /root/.m2/repository
-#
-#
-# multi-repo
-#
-#
-# local-repo
-# file:///root/.m2/repository
-#
-#
-# aliyun-public
-# https://maven.aliyun.com/repository/public
-#
-#
-#
-#
-#
-# multi-repo
-#
-#
-# EOF
-#
-# - name: 构建主POM（仅本地安装，不上传）
-# run: |
-# MAIN_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/pom.xml"
-# if [ ! -f "$MAIN_POM_ABSOLUTE_PATH" ]; then
-# echo "错误：主POM文件不存在"
-# exit 1
-# fi
-#
-# retries=3
-# count=0
-# until "$MAVEN_HOME/bin/mvn" clean install -U -DskipTests -f "$MAIN_POM_ABSOLUTE_PATH"; do
-# count=$((count + 1))
-# if [ $count -ge $retries ]; then
-# echo "错误：主POM构建失败"
-# exit 1
-# fi
-# sleep 10
-# done
-#
-# # build-common-modules:
-# # needs: build-parent-pom
-# # runs-on: ubuntu
-# # steps:
-# # - name: 拉取代码仓库
-# # uses: http://git.missmoc.top/mocheng/checkout@v4
-#
-# # - name: 配置环境变量
-# # run: |
-# # export JAVA_HOME="/java17/java17"
-# # export MAVEN_HOME="/maven/apache-maven-3.9.11"
-# # echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
-# # echo "$JAVA_HOME/bin" >> $GITHUB_PATH
-# # echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV
-# # echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
-#
-# # - name: 构建通用模块（仅本地使用，不上传）
-# # run: |
-# # COMMON_MODULES=(
-# # "ruoyi-common"
-# # "ruoyi-api"
-# # "ruoyi-common-bom"
-# # "ruoyi-common-alibaba-bom"
-# # "ruoyi-api-bom"
-# # )
-#
-# # for module in "${COMMON_MODULES[@]}"; do
-# # MODULE_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${module}/pom.xml"
-# # if [ ! -f "$MODULE_POM_ABSOLUTE_PATH" ]; then
-# # echo "警告：模块 $module 不存在，跳过"
-# # continue
-# # fi
-#
-# # retries=3
-# # count=0
-# # until "$MAVEN_HOME/bin/mvn" clean compile install -U -DskipTests -f "$MODULE_POM_ABSOLUTE_PATH"; do
-# # count=$((count + 1))
-# # if [ $count -ge $retries ]; then
-# # echo "错误：模块 $module 构建失败"
-# # exit 1
-# # fi
-# # sleep 10
-# # done
-# # done
-#
-# build-and-push-services:
-# needs: build-common-modules
-# runs-on: ubuntu
-# strategy:
-# matrix:
-# service:
-# - ruoyi-auth
-# - ruoyi-gateway
-# - ruoyi-modules/Property
-# - ruoyi-modules/ruoyi-gen
-# - ruoyi-modules/ruoyi-job
-# - ruoyi-modules/ruoyi-resource
-# - ruoyi-modules/ruoyi-system
-# - ruoyi-modules/ruoyi-workflow
-# - ruoyi-modules/Sis
-# - ruoyi-visual/ruoyi-monitor
-# - ruoyi-visual/ruoyi-nacos
-# - ruoyi-seata-server
-# - ruoyi-sentinel-dashboard
-# - ruoyi-snailjob-server
-# steps:
-# - name: 拉取代码仓库
-# uses: http://git.missmoc.top/mocheng/checkout@v4
-#
-# - name: 配置环境变量
-# run: |
-# export JAVA_HOME="/java17/java17"
-# export MAVEN_HOME="/maven/apache-maven-3.9.11"
-# echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
-# echo "$JAVA_HOME/bin" >> $GITHUB_PATH
-# echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV
-# echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
-#
-# - name: 构建服务模块
-# run: |
-# SERVICE_NAME="${{ matrix.service }}"
-# SERVICE_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${SERVICE_NAME}/pom.xml"
-# if [ ! -f "$SERVICE_POM_ABSOLUTE_PATH" ]; then
-# echo "错误：服务 $SERVICE_NAME 的POM文件不存在"
-# exit 1
-# fi
-#
-# "$MAVEN_HOME/bin/mvn" clean package -U -DskipTests -f "$SERVICE_POM_ABSOLUTE_PATH"
-#
-# - name: 配置Docker Buildx
-# uses: http://git.missmoc.top/mocheng/setup-buildx-action@v3
-#
-# - name: 登录到容器仓库
-# uses: http://git.missmoc.top/mocheng/login-action@v3
-# with:
-# registry: ${{ secrets.REGISTRY_URL }}
-# username: ${{ secrets.REGISTRY_USER }}
-# password: ${{ secrets.REGISTRY_PASS }}
-#
-# - name: 确定Dockerfile路径
-# id: dockerfile-path
-# run: |
-# SERVICE_NAME="${{ matrix.service }}"
-# DOCKERFILE_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${SERVICE_NAME}/Dockerfile"
-#
-# if [ -f "$DOCKERFILE_ABSOLUTE_PATH" ]; then
-# echo "dockerfile_path=$DOCKERFILE_ABSOLUTE_PATH" >> $GITHUB_OUTPUT
-# else
-# echo "dockerfile_path=${GITHUB_WORKSPACE}/Dockerfile" >> $GITHUB_OUTPUT
-# fi
-#
-# - name: 构建并推送Docker镜像（仅推送镜像，不上传JAR）
-# uses: http://git.missmoc.top/mocheng/build-push-action@v5
-# with:
-# context: "${{ github.workspace }}"
-# file: "${{ github.workspace }}/${{ matrix.service }}/Dockerfile"
-# tags: "172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest"
-# push: true
-# cache-from: type=gha
-# cache-to: type=gha,mode=max
-#
-# # 关键配置：允许该仓库使用HTTP
-# daemon-config: |
-# {
-# "insecure-registries": ["172.100.10.45:3000"]
-# }
-#
-# # 确保buildx使用正确的网络配置
-# driver-opts: |
-# network=host
-## context: "${{ github.workspace }}"
-## file: ${{ github.workspace }}/${{ matrix.service }}/Dockerfile
-## tags: 172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest
-## # tags: ${{ secrets.REGISTRY_URL }}/by2025/$(echo ${{ matrix.service }} | tr 'A-Z' 'a-z'):${{ github.sha }}
-## # tags: ${{ secrets.REGISTRY_URL }}/by2025/${{ matrix.service }}:2.0.4
-## push: true
-## cache-from: type=gha
-## cache-to: type=gha,mode=max
-
-
run-name: ${{ gitea.actor }} 构建镜像并推送（不含JAR依赖上传）🚀
on:
push:
From 007c40b9e645b71af526c06f3d7d4185cc9cd14d Mon Sep 17 00:00:00 2001
From: mocheng <3057647414@qq.com>
Date: Thu, 14 Aug 2025 17:18:34 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?=
=?UTF-8?q?=E9=95=9C=E5=83=8F1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitea/workflows/dev.yml | 117 +++++++++++++++++++--------------------
1 file changed, 56 insertions(+), 61 deletions(-)
diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml
index 3b644811..1931e454 100644
--- a/.gitea/workflows/dev.yml
+++ b/.gitea/workflows/dev.yml
@@ -80,50 +80,50 @@ jobs:
sleep 10
done
- build-common-modules:
- needs: build-parent-pom
- runs-on: ubuntu
- steps:
- - name: 拉取代码仓库
- uses: http://git.missmoc.top/mocheng/checkout@v4
+ # build-common-modules:
+ # needs: build-parent-pom
+ # runs-on: ubuntu
+ # steps:
+ # - name: 拉取代码仓库
+ # uses: http://git.missmoc.top/mocheng/checkout@v4
- - name: 配置环境变量
- run: |
- export JAVA_HOME="/java17/java17"
- export MAVEN_HOME="/maven/apache-maven-3.9.11"
- echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
- echo "$JAVA_HOME/bin" >> $GITHUB_PATH
- echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV
- echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
+ # - name: 配置环境变量
+ # run: |
+ # export JAVA_HOME="/java17/java17"
+ # export MAVEN_HOME="/maven/apache-maven-3.9.11"
+ # echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
+ # echo "$JAVA_HOME/bin" >> $GITHUB_PATH
+ # echo "MAVEN_HOME=$MAVEN_HOME" >> $GITHUB_ENV
+ # echo "$MAVEN_HOME/bin" >> $GITHUB_PATH
- - name: 构建通用模块（仅本地使用，不上传）
- run: |
- COMMON_MODULES=(
- "ruoyi-common"
- "ruoyi-api"
- "ruoyi-common-bom"
- "ruoyi-common-alibaba-bom"
- "ruoyi-api-bom"
- )
+ # - name: 构建通用模块（仅本地使用，不上传）
+ # run: |
+ # COMMON_MODULES=(
+ # "ruoyi-common"
+ # "ruoyi-api"
+ # "ruoyi-common-bom"
+ # "ruoyi-common-alibaba-bom"
+ # "ruoyi-api-bom"
+ # )
- for module in "${COMMON_MODULES[@]}"; do
- MODULE_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${module}/pom.xml"
- if [ ! -f "$MODULE_POM_ABSOLUTE_PATH" ]; then
- echo "警告：模块 $module 不存在，跳过"
- continue
- fi
+ # for module in "${COMMON_MODULES[@]}"; do
+ # MODULE_POM_ABSOLUTE_PATH="${GITHUB_WORKSPACE}/${module}/pom.xml"
+ # if [ ! -f "$MODULE_POM_ABSOLUTE_PATH" ]; then
+ # echo "警告：模块 $module 不存在，跳过"
+ # continue
+ # fi
- retries=3
- count=0
- until "$MAVEN_HOME/bin/mvn" clean compile install -U -DskipTests -f "$MODULE_POM_ABSOLUTE_PATH"; do
- count=$((count + 1))
- if [ $count -ge $retries ]; then
- echo "错误：模块 $module 构建失败"
- exit 1
- fi
- sleep 10
- done
- done
+ # retries=3
+ # count=0
+ # until "$MAVEN_HOME/bin/mvn" clean compile install -U -DskipTests -f "$MODULE_POM_ABSOLUTE_PATH"; do
+ # count=$((count + 1))
+ # if [ $count -ge $retries ]; then
+ # echo "错误：模块 $module 构建失败"
+ # exit 1
+ # fi
+ # sleep 10
+ # done
+ # done
build-and-push-services:
needs: build-common-modules
@@ -169,21 +169,8 @@ jobs:
"$MAVEN_HOME/bin/mvn" clean package -U -DskipTests -f "$SERVICE_POM_ABSOLUTE_PATH"
- - name: 检查JAR文件是否存在
- run: |
- SERVICE_NAME="${{ matrix.service }}"
- JAR_PATH="${GITHUB_WORKSPACE}/${SERVICE_NAME}/target/$(basename ${SERVICE_NAME}).jar"
- if [ ! -f "$JAR_PATH" ]; then
- echo "错误：JAR文件不存在 - $JAR_PATH"
- echo "目标目录内容："
- ls -l "${GITHUB_WORKSPACE}/${SERVICE_NAME}/target"
- exit 1
- fi
-
- - name: 配置Docker Buildx（使用原生Docker驱动）
+ - name: 配置Docker Buildx
uses: http://git.missmoc.top/mocheng/setup-buildx-action@v3
- with:
- driver: docker # 避免容器化驱动的网络隔离问题
- name: 登录到容器仓库
uses: http://git.missmoc.top/mocheng/login-action@v3
@@ -207,19 +194,27 @@ jobs:
- name: 构建并推送Docker镜像（仅推送镜像，不上传JAR）
uses: http://git.missmoc.top/mocheng/build-push-action@v5
with:
- # 使用服务模块目录作为构建上下文（确保能找到target/JAR）
- context: "${{ github.workspace }}/${{ matrix.service }}"
- file: "${{ steps.dockerfile-path.outputs.dockerfile_path }}"
- # 处理镜像标签中的斜杠（避免格式错误）
- tags: "172.100.10.45:3000/by2025/smartparks/$(echo ${{ matrix.service }} | tr '/' '-'):latest"
+ context: "${{ github.workspace }}"
+ file: "${{ github.workspace }}/${{ matrix.service }}/Dockerfile"
+ tags: "172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest"
push: true
cache-from: type=gha
cache-to: type=gha,mode=max
- # 允许HTTP访问私有仓库
+
+ # 关键配置：允许该仓库使用HTTP
daemon-config: |
{
"insecure-registries": ["172.100.10.45:3000"]
}
- # 禁用容器化网络，使用主机网络
+
+ # 确保buildx使用正确的网络配置
driver-opts: |
network=host
+# context: "${{ github.workspace }}"
+# file: ${{ github.workspace }}/${{ matrix.service }}/Dockerfile
+# tags: 172.100.10.45:3000/by2025/smartparks/${{ matrix.service }}:latest
+# # tags: ${{ secrets.REGISTRY_URL }}/by2025/$(echo ${{ matrix.service }} | tr 'A-Z' 'a-z'):${{ github.sha }}
+# # tags: ${{ secrets.REGISTRY_URL }}/by2025/${{ matrix.service }}:2.0.4
+# push: true
+# cache-from: type=gha
+# cache-to: type=gha,mode=max