wangtianqi/java_demo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: optimize Docker build - use Alpine images, add timeout handling and retry logic

Browse Source
This commit is contained in:
wangtianqi 2025-06-23 22:36:43 +08:00
parent 194442170e
commit caa85bc6e8
2 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -1,5 +1,5 @@
# 使用多阶段构建优化镜像大小 # 使用多阶段构建优化镜像大小
FROM openjdk:17-jdk-slim as builder FROM amazoncorretto:17-alpine-jdk as builder
# 设置工作目录 # 设置工作目录
WORKDIR /app WORKDIR /app
@ -18,15 +18,19 @@ COPY src ./src
# 构建应用 # 构建应用
RUN ./mvnw clean package -DskipTests RUN ./mvnw clean package -DskipTests
# 运行时镜像 # 运行时镜像 - 使用更小的Alpine镜像
FROM openjdk:17-jre-slim FROM amazoncorretto:17-alpine
# 安装curl用于健康检查
RUN apk add --no-cache curl
# 设置时区 # 设置时区
ENV TZ=Asia/Shanghai ENV TZ=Asia/Shanghai
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apk add --no-cache tzdata && \
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# 创建非root用户 # 创建非root用户
RUN groupadd -r spring && useradd -r -g spring spring RUN addgroup -g 1000 spring && adduser -u 1000 -G spring -s /bin/sh -D spring
# 创建应用目录 # 创建应用目录
WORKDIR /app WORKDIR /app

41
Jenkinsfile vendored
View File

@ -1,9 +1,8 @@
pipeline { pipeline {
agent any agent any
options {
options {
buildDiscarder(logRotator(numToKeepStr: '10')) buildDiscarder(logRotator(numToKeepStr: '10'))
timeout(time: 30, unit: 'MINUTES') timeout(time: 60, unit: 'MINUTES') // 增加到60分钟
timestamps() timestamps()
} }
@ -145,17 +144,37 @@ pipeline {
} }
} }
} }
stage('构建Docker镜像') {
stage('构建Docker镜像') {
steps { steps {
echo '🐳 构建Docker镜像...' echo '🐳 构建Docker镜像...'
script { script {
def image = docker.build("${IMAGE_NAME}:${IMAGE_TAG}") retry(2) {
try {
// 也创建latest标签 // 清理旧镜像以节省空间
sh "docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${IMAGE_NAME}:latest" sh 'docker image prune -f || true'
echo "✅ Docker镜像构建完成: ${IMAGE_NAME}:${IMAGE_TAG}" echo "开始构建Docker镜像: ${IMAGE_NAME}:${IMAGE_TAG}"
// 使用timeout包装Docker构建
timeout(time: 15, unit: 'MINUTES') {
def image = docker.build("${IMAGE_NAME}:${IMAGE_TAG}")
// 也创建latest标签
sh "docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${IMAGE_NAME}:latest"
}
echo "✅ Docker镜像构建完成: ${IMAGE_NAME}:${IMAGE_TAG}"
// 验证镜像是否创建成功
sh "docker images ${IMAGE_NAME}:${IMAGE_TAG}"
} catch (Exception e) {
echo "⚠️ Docker构建失败: ${e.getMessage()}"
// 清理可能的中间状态
sh 'docker system prune -f || true'
throw e
}
}
} }
} }
} }