Compare commits
No commits in common. "4d7b72d9e56b1ee5c53df3a3f7802e06731aa79a" and "1a8d663c51777797d7ad74cb231ec40ff17c9e4c" have entirely different histories.
4d7b72d9e5
...
1a8d663c51
26
Dockerfile
26
Dockerfile
@ -4,21 +4,7 @@ FROM amazoncorretto:17-alpine-jdk as builder
|
||||
# 设置工作目录
|
||||
WORKDIR /app
|
||||
|
||||
# 设置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缓存）
|
||||
# 复制Maven配置文件
|
||||
COPY pom.xml .
|
||||
COPY .mvn .mvn
|
||||
COPY mvnw .
|
||||
@ -26,16 +12,14 @@ COPY mvnw .
|
||||
# 给mvnw脚本添加执行权限
|
||||
RUN chmod +x ./mvnw
|
||||
|
||||
# 首先只复制pom.xml并下载依赖（利用Docker层缓存）
|
||||
RUN --mount=type=cache,target=/root/.m2 \
|
||||
./mvnw dependency:resolve -B
|
||||
# 下载依赖（利用Docker缓存层）
|
||||
RUN ./mvnw dependency:go-offline -B
|
||||
|
||||
# 复制源代码
|
||||
COPY src ./src
|
||||
|
||||
# 构建应用（使用缓存挂载优化Maven依赖下载）
|
||||
RUN --mount=type=cache,target=/root/.m2 \
|
||||
./mvnw clean package -DskipTests -B -q
|
||||
# 构建应用
|
||||
RUN ./mvnw clean package -DskipTests
|
||||
|
||||
# 运行时镜像 - 使用更小的Alpine镜像
|
||||
FROM amazoncorretto:17-alpine
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
# 简化的单阶段构建
|
||||
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"]
|
||||
74
Jenkinsfile
vendored
74
Jenkinsfile
vendored
@ -143,58 +143,24 @@ pipeline {
|
||||
}
|
||||
}
|
||||
}
|
||||
} stage('构建Docker镜像') {
|
||||
}
|
||||
stage('构建Docker镜像') {
|
||||
steps {
|
||||
echo '🐳 构建Docker镜像...'
|
||||
script {
|
||||
retry(3) {
|
||||
retry(2) {
|
||||
try {
|
||||
// 清理旧镜像以节省空间
|
||||
sh 'docker image prune -f || true'
|
||||
|
||||
echo "开始构建Docker镜像: ${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
|
||||
// 使用timeout包装Docker构建
|
||||
timeout(time: 15, unit: 'MINUTES') {
|
||||
def image = docker.build("${IMAGE_NAME}:${IMAGE_TAG}")
|
||||
|
||||
# 创建并使用新的构建器实例
|
||||
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
|
||||
'''
|
||||
// 也创建latest标签
|
||||
sh "docker tag ${IMAGE_NAME}:${IMAGE_TAG} ${IMAGE_NAME}:latest"
|
||||
}
|
||||
|
||||
echo "✅ Docker镜像构建完成: ${IMAGE_NAME}:${IMAGE_TAG}"
|
||||
@ -204,11 +170,8 @@ pipeline {
|
||||
|
||||
} catch (Exception e) {
|
||||
echo "⚠️ Docker构建失败: ${e.getMessage()}"
|
||||
// 清理可能的中间状态和缓存
|
||||
sh '''
|
||||
docker system prune -f || true
|
||||
rm -rf /tmp/.buildx-cache* || true
|
||||
'''
|
||||
// 清理可能的中间状态
|
||||
sh 'docker system prune -f || true'
|
||||
throw e
|
||||
}
|
||||
}
|
||||
@ -424,27 +387,14 @@ EOF
|
||||
unstable {
|
||||
echo '⚠️ 构建不稳定，可能存在测试失败'
|
||||
}
|
||||
|
||||
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()}"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user