Compare commits

...

2 Commits

Author SHA1 Message Date
4d7b72d9e5 feat: Add simplified Dockerfile as backup option
- Add Dockerfile.simple with single-stage build
- Uses system Maven instead of Maven Wrapper
- Simpler and more reliable for environments with wrapper issues
- Can be used as fallback if Buildx build fails
2025-06-24 00:13:20 +08:00
1f90427fb7 feat: Enable Docker Buildx for faster and more reliable builds
Features:
-  Enable Docker Buildx with advanced caching
-  Add BuildKit cache mount for Maven dependencies
-  Use Aliyun Maven mirror for faster dependency downloads
-  Optimize Docker layer caching strategy
-  Add automatic cache cleanup to prevent disk overflow
-  Increase build timeout to 30 minutes
-  Add buildx builder instance management

Performance improvements:
- Parallel builds with Buildx
- Persistent Maven cache with RUN --mount=type=cache
- Layer-optimized Dockerfile structure
- Automatic cache rotation

This should significantly reduce Docker build time and improve reliability.
2025-06-24 00:08:36 +08:00
3 changed files with 130 additions and 18 deletions

View File

@ -4,7 +4,21 @@ FROM amazoncorretto:17-alpine-jdk as builder
# 设置工作目录
WORKDIR /app
# 复制Maven配置文件
# 设置Maven镜像源提高下载速度
RUN mkdir -p /root/.m2 && \
echo '<?xml version="1.0" encoding="UTF-8"?>' > /root/.m2/settings.xml && \
echo '<settings>' >> /root/.m2/settings.xml && \
echo ' <mirrors>' >> /root/.m2/settings.xml && \
echo ' <mirror>' >> /root/.m2/settings.xml && \
echo ' <id>aliyun</id>' >> /root/.m2/settings.xml && \
echo ' <name>Aliyun Central</name>' >> /root/.m2/settings.xml && \
echo ' <url>https://maven.aliyun.com/repository/central</url>' >> /root/.m2/settings.xml && \
echo ' <mirrorOf>central</mirrorOf>' >> /root/.m2/settings.xml && \
echo ' </mirror>' >> /root/.m2/settings.xml && \
echo ' </mirrors>' >> /root/.m2/settings.xml && \
echo '</settings>'
# 复制Maven配置文件和脚本利用Docker缓存
COPY pom.xml .
COPY .mvn .mvn
COPY mvnw .
@ -12,14 +26,16 @@ COPY mvnw .
# 给mvnw脚本添加执行权限
RUN chmod +x ./mvnw
# 下载依赖利用Docker缓存层
RUN ./mvnw dependency:go-offline -B
# 首先只复制pom.xml并下载依赖利用Docker层缓存
RUN --mount=type=cache,target=/root/.m2 \
./mvnw dependency:resolve -B
# 复制源代码
COPY src ./src
# 构建应用
RUN ./mvnw clean package -DskipTests
# 构建应用使用缓存挂载优化Maven依赖下载
RUN --mount=type=cache,target=/root/.m2 \
./mvnw clean package -DskipTests -B -q
# 运行时镜像 - 使用更小的Alpine镜像
FROM amazoncorretto:17-alpine

46
Dockerfile.simple Normal file
View File

@ -0,0 +1,46 @@
# 简化的单阶段构建
FROM amazoncorretto:17-alpine
# 安装Maven
RUN apk add --no-cache maven
# 设置工作目录
WORKDIR /app
# 复制所有源代码和Maven配置
COPY . .
# 给mvnw脚本添加执行权限如果存在
RUN chmod +x mvnw || true
# 构建应用使用系统Maven避免wrapper问题
RUN mvn clean package -DskipTests -B
# 安装curl用于健康检查
RUN apk add --no-cache curl tzdata
# 设置时区
ENV TZ=Asia/Shanghai
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# 创建非root用户
RUN addgroup -g 1000 spring && adduser -u 1000 -G spring -s /bin/sh -D spring
# 创建应用目录和日志目录
RUN mkdir -p /app/logs && chown -R spring:spring /app
# 切换到非root用户
USER spring
# 暴露端口
EXPOSE 8080
# 健康检查
HEALTHCHECK --interval=30s --timeout=3s --start-period=60s --retries=3 \
CMD curl -f http://localhost:8080/api/health || exit 1
# JVM调优参数
ENV JAVA_OPTS="-server -Xms256m -Xmx512m -XX:+UseG1GC -XX:+UseContainerSupport -XX:MaxRAMPercentage=75.0"
# 启动应用
ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar target/*.jar"]

76
Jenkinsfile vendored
View File

@ -143,24 +143,58 @@ pipeline {
}
}
}
}
stage('构建Docker镜像') {
} stage('构建Docker镜像') {
steps {
echo '🐳 构建Docker镜像...'
script {
retry(2) {
retry(3) {
try {
// 清理旧镜像以节省空间
sh 'docker image prune -f || true'
echo "开始构建Docker镜像: ${IMAGE_NAME}:${IMAGE_TAG}"
// 使用timeout包装Docker构建
timeout(time: 15, unit: 'MINUTES') {
def image = docker.build("${IMAGE_NAME}:${IMAGE_TAG}")
// 启用Docker Buildx并创建构建器
sh '''
# 检查并安装buildx如果需要
if ! docker buildx version; then
echo "Installing Docker Buildx..."
DOCKER_BUILDX_VERSION=v0.12.1
curl -L https://github.com/docker/buildx/releases/download/${DOCKER_BUILDX_VERSION}/buildx-${DOCKER_BUILDX_VERSION}.linux-amd64 -o docker-buildx
chmod +x docker-buildx
mkdir -p ~/.docker/cli-plugins
mv docker-buildx ~/.docker/cli-plugins/
fi
// 也创建latest标签
sh "docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${IMAGE_NAME}:latest"
# 创建并使用新的构建器实例
docker buildx create --name jenkins-builder --use --bootstrap || docker buildx use jenkins-builder
# 验证构建器状态
docker buildx inspect --bootstrap
'''
// 使用Buildx构建镜像增加超时时间到30分钟
timeout(time: 30, unit: 'MINUTES') {
sh '''
# 使用Buildx构建镜像启用缓存和并行构建
docker buildx build \\
--builder jenkins-builder \\
--platform linux/amd64 \\
--cache-from type=local,src=/tmp/.buildx-cache \\
--cache-to type=local,dest=/tmp/.buildx-cache-new,mode=max \\
--build-arg BUILDKIT_INLINE_CACHE=1 \\
--build-arg HTTP_PROXY= \\
--build-arg HTTPS_PROXY= \\
--network=host \\
--load \\
-t ${IMAGE_NAME}:${IMAGE_TAG} \\
-t ${IMAGE_NAME}:latest \\
.
# 移动缓存(避免缓存无限增长)
rm -rf /tmp/.buildx-cache || true
mv /tmp/.buildx-cache-new /tmp/.buildx-cache || true
'''
}
echo "✅ Docker镜像构建完成: ${IMAGE_NAME}:${IMAGE_TAG}"
@ -170,8 +204,11 @@ pipeline {
} catch (Exception e) {
echo "⚠️ Docker构建失败: ${e.getMessage()}"
// 清理可能的中间状态
sh 'docker system prune -f || true'
// 清理可能的中间状态和缓存
sh '''
docker system prune -f || true
rm -rf /tmp/.buildx-cache* || true
'''
throw e
}
}
@ -387,14 +424,27 @@ EOF
unstable {
echo '⚠️ 构建不稳定,可能存在测试失败'
}
cleanup {
cleanup {
script {
try {
// 清理Docker构建缓存防止磁盘空间不足
sh '''
# 清理buildx缓存
rm -rf /tmp/.buildx-cache* || true
# 清理未使用的Docker资源
docker system prune -f || true
# 移除构建器(如果存在)
docker buildx rm jenkins-builder || true
'''
// 清理工作空间
cleanWs()
echo "✅ 清理完成"
} catch (Exception e) {
echo "⚠️ 工作空间清理失败: ${e.getMessage()}"
echo "⚠️ 清理失败: ${e.getMessage()}"
}
}
}