KTeam/kt-template-online-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 对齐NapCat运行时默认版本

Browse Source
This commit is contained in:
sunlei 2026-06-27 01:11:40 +08:00
parent 5c00b08f6b
commit 313ace971d
7 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci/napcat-desktop-cn/README.md
View File

@ -43,17 +43,17 @@ Build and verify:
```powershell ```powershell
docker build ` docker build `
--build-arg NAPCAT_BASE_IMAGE=$napcatBaseImageDigest ` --build-arg NAPCAT_BASE_IMAGE=$napcatBaseImageDigest `
-t kt-napcat-desktop-cn:desktop-cn-v8 ` -t kt-napcat-desktop-cn:desktop-cn-v10 `
-f .kt-workspace/napcat-desktop-cn-build/ci/napcat-desktop-cn/Dockerfile ` -f .kt-workspace/napcat-desktop-cn-build/ci/napcat-desktop-cn/Dockerfile `
.kt-workspace/napcat-desktop-cn-build .kt-workspace/napcat-desktop-cn-build
$name = "kt-napcat-v8-verify-$([DateTimeOffset]::UtcNow.ToUnixTimeSeconds())" $name = "kt-napcat-v10-verify-$([DateTimeOffset]::UtcNow.ToUnixTimeSeconds())"
docker run -d --name $name ` docker run -d --name $name `
--cap-add SYS_ADMIN ` --cap-add SYS_ADMIN `
--security-opt apparmor=unconfined ` --security-opt apparmor=unconfined `
--security-opt seccomp=unconfined ` --security-opt seccomp=unconfined `
-e NAPCAT_REQUIRE_DEVICE_PROFILE=1 ` -e NAPCAT_REQUIRE_DEVICE_PROFILE=1 `
kt-napcat-desktop-cn:desktop-cn-v8 kt-napcat-desktop-cn:desktop-cn-v10
docker exec $name sh /ci/napcat-desktop-cn/verify.sh docker exec $name sh /ci/napcat-desktop-cn/verify.sh
docker rm -f $name docker rm -f $name
``` ```

4
docs/superpowers/plans/2026-06-24-napcatqq-upstream-sync-runtime-release-pipeline-implementation-plan.md
View File

@ -843,8 +843,8 @@ describe('NapCat runtime promotion contract', () => {
it('keeps a safe default runtime profile in the K8s manifest', () => { it('keeps a safe default runtime profile in the K8s manifest', () => {
const manifest = readSource('k8s/prod/api.yaml'); const manifest = readSource('k8s/prod/api.yaml');
expect(manifest).toContain('value: kt-napcat-desktop-cn:desktop-cn-v8'); expect(manifest).toContain('value: kt-napcat-desktop-cn:desktop-cn-v10');
expect(manifest).toContain('value: desktop-cn-v8'); expect(manifest).toContain('value: desktop-cn-v10');
}); });
}); });
``` ```

4
k8s/prod/api.yaml
View File

@ -33,9 +33,9 @@ spec:
- name: DB_TIMEZONE - name: DB_TIMEZONE
value: "+08:00" value: "+08:00"
- name: QQBOT_NAPCAT_IMAGE - name: QQBOT_NAPCAT_IMAGE
value: kt-napcat-desktop-cn:desktop-cn-v8 value: kt-napcat-desktop-cn:desktop-cn-v10
- name: QQBOT_NAPCAT_DESKTOP_PROFILE_VERSION - name: QQBOT_NAPCAT_DESKTOP_PROFILE_VERSION
value: desktop-cn-v8 value: desktop-cn-v10
- name: QQBOT_NAPCAT_SSH_KEY_PATH - name: QQBOT_NAPCAT_SSH_KEY_PATH
value: /app/secrets/napcat-ssh/id_rsa value: /app/secrets/napcat-ssh/id_rsa
- name: QQBOT_PLUGIN_TASK_QUEUE_REDIS_PREFIX - name: QQBOT_PLUGIN_TASK_QUEUE_REDIS_PREFIX

2
src/modules/qqbot/napcat/application/runtime/napcat-runtime-profile.service.ts
View File

@ -71,7 +71,7 @@ export class NapcatRuntimeProfileService {
dataDir: input.dataDir, dataDir: input.dataDir,
desktopProfileVersion: this.getString( desktopProfileVersion: this.getString(
'QQBOT_NAPCAT_DESKTOP_PROFILE_VERSION', 'QQBOT_NAPCAT_DESKTOP_PROFILE_VERSION',
'desktop-cn-v8', 'desktop-cn-v10',
), ),
deviceIdentityId: input.deviceIdentityId, deviceIdentityId: input.deviceIdentityId,
imageRef: this.getString('QQBOT_NAPCAT_IMAGE', ''), imageRef: this.getString('QQBOT_NAPCAT_IMAGE', ''),

7
test/modules/qqbot/napcat/napcat-desktop-cn-image.spec.ts
View File

@ -134,13 +134,14 @@ describe('NapCat Chinese Desktop Runtime image assets', () => {
expect(verify).not.toContain('selfInfo?.online !== false'); expect(verify).not.toContain('selfInfo?.online !== false');
}); });
it('deploys the production API with the verified desktop-cn-v8 runtime profile', () => { it('deploys the production API with the verified desktop-cn-v10 runtime profile', () => {
const manifest = readSource('k8s/prod/api.yaml'); const manifest = readSource('k8s/prod/api.yaml');
expect(manifest).toContain('name: QQBOT_NAPCAT_IMAGE'); expect(manifest).toContain('name: QQBOT_NAPCAT_IMAGE');
expect(manifest).toContain('value: kt-napcat-desktop-cn:desktop-cn-v8'); expect(manifest).toContain('value: kt-napcat-desktop-cn:desktop-cn-v10');
expect(manifest).toContain('name: QQBOT_NAPCAT_DESKTOP_PROFILE_VERSION'); expect(manifest).toContain('name: QQBOT_NAPCAT_DESKTOP_PROFILE_VERSION');
expect(manifest).toContain('value: desktop-cn-v8'); expect(manifest).toContain('value: desktop-cn-v10');
expect(manifest).not.toContain('kt-napcat-desktop-cn:desktop-cn-v8');
expect(manifest).not.toContain('kt-napcat-desktop-cn:desktop-cn-v7'); expect(manifest).not.toContain('kt-napcat-desktop-cn:desktop-cn-v7');
expect(manifest).not.toContain('kt-napcat-desktop-cn:desktop-cn-v4'); expect(manifest).not.toContain('kt-napcat-desktop-cn:desktop-cn-v4');
expect(manifest).not.toContain('kt-napcat-desktop-cn:desktop-cn-v3'); expect(manifest).not.toContain('kt-napcat-desktop-cn:desktop-cn-v3');

4
test/modules/qqbot/napcat/napcat-runtime-promotion.spec.ts
View File

@ -33,7 +33,7 @@ describe('NapCat runtime promotion contract', () => {
it('keeps a safe default runtime profile in the K8s manifest', () => { it('keeps a safe default runtime profile in the K8s manifest', () => {
const manifest = readSource('k8s/prod/api.yaml'); const manifest = readSource('k8s/prod/api.yaml');
expect(manifest).toContain('value: kt-napcat-desktop-cn:desktop-cn-v8'); expect(manifest).toContain('value: kt-napcat-desktop-cn:desktop-cn-v10');
expect(manifest).toContain('value: desktop-cn-v8'); expect(manifest).toContain('value: desktop-cn-v10');
}); });
}); });

2
test/modules/qqbot/napcat/runtime-protocol-profile.spec.ts
View File

@ -123,7 +123,7 @@ describe('NapCat runtime profile generation', () => {
}); });
expect(profile).toMatchObject({ expect(profile).toMatchObject({
desktopProfileVersion: 'desktop-cn-v8', desktopProfileVersion: 'desktop-cn-v10',
imageRef: 'kt-napcat-desktop-cn@sha256:profiledigest', imageRef: 'kt-napcat-desktop-cn@sha256:profiledigest',
locale: 'zh_CN.UTF-8', locale: 'zh_CN.UTF-8',
runtimeGid: 1101, runtimeGid: 1101,