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"