fix: 对齐NapCat运行时默认版本
This commit is contained in:
parent
5c00b08f6b
commit
313ace971d
@ -43,17 +43,17 @@ Build and verify:
|
||||
```powershell
|
||||
docker build `
|
||||
--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 `
|
||||
.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 `
|
||||
--cap-add SYS_ADMIN `
|
||||
--security-opt apparmor=unconfined `
|
||||
--security-opt seccomp=unconfined `
|
||||
-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 rm -f $name
|
||||
```
|
||||
|
||||
@ -843,8 +843,8 @@ describe('NapCat runtime promotion contract', () => {
|
||||
|
||||
it('keeps a safe default runtime profile in the K8s manifest', () => {
|
||||
const manifest = readSource('k8s/prod/api.yaml');
|
||||
expect(manifest).toContain('value: kt-napcat-desktop-cn:desktop-cn-v8');
|
||||
expect(manifest).toContain('value: desktop-cn-v8');
|
||||
expect(manifest).toContain('value: kt-napcat-desktop-cn:desktop-cn-v10');
|
||||
expect(manifest).toContain('value: desktop-cn-v10');
|
||||
});
|
||||
});
|
||||
```
|
||||
|
||||
@ -33,9 +33,9 @@ spec:
|
||||
- name: DB_TIMEZONE
|
||||
value: "+08:00"
|
||||
- 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
|
||||
value: desktop-cn-v8
|
||||
value: desktop-cn-v10
|
||||
- name: QQBOT_NAPCAT_SSH_KEY_PATH
|
||||
value: /app/secrets/napcat-ssh/id_rsa
|
||||
- name: QQBOT_PLUGIN_TASK_QUEUE_REDIS_PREFIX
|
||||
|
||||
@ -71,7 +71,7 @@ export class NapcatRuntimeProfileService {
|
||||
dataDir: input.dataDir,
|
||||
desktopProfileVersion: this.getString(
|
||||
'QQBOT_NAPCAT_DESKTOP_PROFILE_VERSION',
|
||||
'desktop-cn-v8',
|
||||
'desktop-cn-v10',
|
||||
),
|
||||
deviceIdentityId: input.deviceIdentityId,
|
||||
imageRef: this.getString('QQBOT_NAPCAT_IMAGE', ''),
|
||||
|
||||
@ -134,13 +134,14 @@ describe('NapCat Chinese Desktop Runtime image assets', () => {
|
||||
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');
|
||||
|
||||
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('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-v4');
|
||||
expect(manifest).not.toContain('kt-napcat-desktop-cn:desktop-cn-v3');
|
||||
|
||||
@ -33,7 +33,7 @@ describe('NapCat runtime promotion contract', () => {
|
||||
it('keeps a safe default runtime profile in the K8s manifest', () => {
|
||||
const manifest = readSource('k8s/prod/api.yaml');
|
||||
|
||||
expect(manifest).toContain('value: kt-napcat-desktop-cn:desktop-cn-v8');
|
||||
expect(manifest).toContain('value: desktop-cn-v8');
|
||||
expect(manifest).toContain('value: kt-napcat-desktop-cn:desktop-cn-v10');
|
||||
expect(manifest).toContain('value: desktop-cn-v10');
|
||||
});
|
||||
});
|
||||
|
||||
@ -123,7 +123,7 @@ describe('NapCat runtime profile generation', () => {
|
||||
});
|
||||
|
||||
expect(profile).toMatchObject({
|
||||
desktopProfileVersion: 'desktop-cn-v8',
|
||||
desktopProfileVersion: 'desktop-cn-v10',
|
||||
imageRef: 'kt-napcat-desktop-cn@sha256:profiledigest',
|
||||
locale: 'zh_CN.UTF-8',
|
||||
runtimeGid: 1101,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user