fix: Dockerfile 使用 npm install 替代 npm ci
npm ci 需要 package-lock.json 文件,改用 npm install Co-Authored-By: Claude <noreply@anthropic.com>
这个提交包含在:
父节点
8fc4c95138
当前提交
3c0d322e0b
@ -3,8 +3,8 @@ FROM node:20-alpine AS builder
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
COPY package.json package-lock.json* ./
|
COPY package.json ./
|
||||||
RUN npm ci
|
RUN npm install
|
||||||
|
|
||||||
# Copy source
|
# Copy source
|
||||||
COPY tsconfig.json ./
|
COPY tsconfig.json ./
|
||||||
@ -19,8 +19,8 @@ FROM node:20-alpine
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
COPY package.json package-lock.json* ./
|
COPY package.json ./
|
||||||
RUN npm ci --production
|
RUN npm install --production
|
||||||
|
|
||||||
# Copy built files
|
# Copy built files
|
||||||
COPY --from=builder /app/dist ./dist
|
COPY --from=builder /app/dist ./dist
|
||||||
|
|||||||
130
Jenkinsfile
vendored
普通文件
130
Jenkinsfile
vendored
普通文件
@ -0,0 +1,130 @@
|
|||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
|
||||||
|
environment {
|
||||||
|
ACR_REGISTRY = 'crpi-n44qjpuucgjt8e8c.cn-beijing.personal.cr.aliyuncs.com'
|
||||||
|
ACR_NAMESPACE = 'xuqmgroup'
|
||||||
|
ACR_USERNAME = 'xuqinmin12'
|
||||||
|
PROD_HOST = '106.54.23.149'
|
||||||
|
PROD_USER = 'ubuntu'
|
||||||
|
COMPOSE_FILE = '/opt/xuqm/deploy/compose.production.yaml'
|
||||||
|
VERSIONS_FILE = '/opt/xuqm/deploy/versions.json'
|
||||||
|
IMAGE_NAME = 'symbolicator'
|
||||||
|
VERSION_FILE = 'VERSION.symbolicator'
|
||||||
|
}
|
||||||
|
|
||||||
|
options {
|
||||||
|
timeout(time: 30, unit: 'MINUTES')
|
||||||
|
buildDiscarder(logRotator(numToKeepStr: '20'))
|
||||||
|
disableConcurrentBuilds()
|
||||||
|
}
|
||||||
|
|
||||||
|
stages {
|
||||||
|
stage('Checkout') {
|
||||||
|
steps {
|
||||||
|
checkout([
|
||||||
|
$class: 'GitSCM',
|
||||||
|
branches: [[name: 'main']],
|
||||||
|
extensions: [[$class: 'CleanBeforeCheckout']],
|
||||||
|
userRemoteConfigs: [[
|
||||||
|
url: 'https://xuqinmin12:28115f261568d510d230727b3e82c0167414286e@xuqinmin.com/xuqmGroup/XuqmGroup-Symbolicator.git'
|
||||||
|
]]
|
||||||
|
])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Resolve Version') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
def current = fileExists(env.VERSION_FILE) ? readFile(env.VERSION_FILE).trim() : '1.0.0'
|
||||||
|
def parts = current.tokenize('.')
|
||||||
|
while (parts.size() < 3) parts.add('0')
|
||||||
|
def newVer = "${parts[0]}.${parts[1]}.${parts[2].toInteger() + 1}"
|
||||||
|
env.IMAGE_VERSION = newVer
|
||||||
|
writeFile file: env.VERSION_FILE, text: newVer
|
||||||
|
echo "${env.IMAGE_NAME}: ${current} → ${newVer}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Docker Build & Push') {
|
||||||
|
steps {
|
||||||
|
withCredentials([string(credentialsId: 'ACR_PASSWORD', variable: 'ACR_PASS')]) {
|
||||||
|
script {
|
||||||
|
def base = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}"
|
||||||
|
def versionedImage = "${base}:${env.IMAGE_VERSION}"
|
||||||
|
def latestImage = "${base}:latest"
|
||||||
|
bat """
|
||||||
|
chcp 65001 >nul
|
||||||
|
docker login ${env.ACR_REGISTRY} -u ${env.ACR_USERNAME} -p %ACR_PASS%
|
||||||
|
if %errorlevel% neq 0 exit /b 1
|
||||||
|
docker pull --platform=linux/amd64 ${latestImage} || echo Pull failed, will build fresh
|
||||||
|
docker build --platform=linux/amd64 --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from ${latestImage} -t ${versionedImage} -t ${latestImage} .
|
||||||
|
if %errorlevel% neq 0 exit /b 1
|
||||||
|
docker push ${versionedImage}
|
||||||
|
if %errorlevel% neq 0 exit /b 1
|
||||||
|
docker push ${latestImage}
|
||||||
|
if %errorlevel% neq 0 exit /b 1
|
||||||
|
docker rmi ${versionedImage} ${latestImage}
|
||||||
|
exit /b 0
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Deploy to Production') {
|
||||||
|
steps {
|
||||||
|
lock('prod-deploy') {
|
||||||
|
withCredentials([sshUserPrivateKey(credentialsId: 'PROD_SSH_KEY', keyFileVariable: 'SSH_KEY')]) {
|
||||||
|
script {
|
||||||
|
def latestImage = "${env.ACR_REGISTRY}/${env.ACR_NAMESPACE}/${env.IMAGE_NAME}:latest"
|
||||||
|
retry(2) {
|
||||||
|
bat """
|
||||||
|
chcp 65001 >nul
|
||||||
|
ssh -i "%SSH_KEY%" -o StrictHostKeyChecking=no ${env.PROD_USER}@${env.PROD_HOST} "docker image prune -f 2>/dev/null || true; docker pull ${latestImage} || exit 1; docker compose -f ${env.COMPOSE_FILE} up -d --no-deps --force-recreate symbolicator || exit 1; docker image prune -f"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
def releasedAt = new Date().format("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone('UTC'))
|
||||||
|
def updateScript = """\
|
||||||
|
import json, os
|
||||||
|
path = '${env.VERSIONS_FILE}'
|
||||||
|
d = json.load(open(path)) if os.path.exists(path) else {}
|
||||||
|
d.setdefault('services', {})['symbolicator'] = {'version': '${env.IMAGE_VERSION}', 'changed': True}
|
||||||
|
d['releasedAt'] = '${releasedAt}'
|
||||||
|
json.dump(d, open(path, 'w'), indent=2, ensure_ascii=False)
|
||||||
|
print('versions.json updated: symbolicator = ${env.IMAGE_VERSION}')
|
||||||
|
""".stripIndent()
|
||||||
|
writeFile file: 'update_versions.py', text: updateScript
|
||||||
|
bat """
|
||||||
|
chcp 65001 >nul
|
||||||
|
scp -i "%SSH_KEY%" -o StrictHostKeyChecking=no update_versions.py ${env.PROD_USER}@${env.PROD_HOST}:/tmp/update_versions.py
|
||||||
|
ssh -i "%SSH_KEY%" -o StrictHostKeyChecking=no ${env.PROD_USER}@${env.PROD_HOST} "python3 /tmp/update_versions.py && rm /tmp/update_versions.py"
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Commit Version') {
|
||||||
|
steps {
|
||||||
|
script {
|
||||||
|
bat """
|
||||||
|
chcp 65001 >nul
|
||||||
|
git config user.email "jenkins@xuqm.com"
|
||||||
|
git config user.name "Jenkins CI"
|
||||||
|
git add ${env.VERSION_FILE}
|
||||||
|
git diff --cached --quiet || git commit -m "ci: bump ${env.IMAGE_NAME} to ${env.IMAGE_VERSION} [skip ci]"
|
||||||
|
git push origin HEAD:main
|
||||||
|
"""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
post {
|
||||||
|
success { bat "chcp 65001 >nul && echo ✅ ${env.IMAGE_NAME}:${env.IMAGE_VERSION} 构建部署成功" }
|
||||||
|
failure { bat 'chcp 65001 >nul && echo ❌ 构建失败,请检查日志' }
|
||||||
|
}
|
||||||
|
}
|
||||||
正在加载...
在新工单中引用
屏蔽一个用户