diff --git a/.gitea/workflows/dev.yml b/.gitea/workflows/dev.yml index 3270cd20..1931e454 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,7 +184,7 @@ 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 @@ -194,12 +194,27 @@ 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 - # 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 + 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 - \ No newline at end of file + + # 关键配置:允许该仓库使用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 diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile index 8555931b..716df43d 100644 --- a/ruoyi-auth/Dockerfile +++ b/ruoyi-auth/Dockerfile @@ -1,6 +1,8 @@ # 贝尔实验室 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 172.100.10.45:3000/by2025/base-images/liberica-openjdk-debian:17.0.11-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li"