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-22 18:01:02 +08:00
parent 98e694d8e9
commit 2e960f94d3
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/qqbot/napcat/infrastructure/integration/container/qqbot-napcat-container.service.ts
View File

@ -1402,7 +1402,12 @@ docker logs --since "$SINCE" --tail 300 "$NAME" 2>&1 || true
const passwordRunFlag = loginPassword const passwordRunFlag = loginPassword
? ' -e NAPCAT_QUICK_PASSWORD="$NAPCAT_QUICK_PASSWORD" \\\n' ? ' -e NAPCAT_QUICK_PASSWORD="$NAPCAT_QUICK_PASSWORD" \\\n'
: ''; : '';
const pullCmd = input.skipPull ? '' : 'docker pull "$IMAGE" >/dev/null\n'; const pullCmd = input.skipPull
? ''
: `if ! docker image inspect "$IMAGE" >/dev/null 2>&1; then
docker pull "$IMAGE" >/dev/null
fi
`;
const deviceHeader = input.deviceIdentity const deviceHeader = input.deviceIdentity
? [ ? [
`NAPCAT_HOSTNAME=${this.sh(input.deviceIdentity.hostname)}`, `NAPCAT_HOSTNAME=${this.sh(input.deviceIdentity.hostname)}`,

21
test/qqbot/napcat/qqbot-napcat-container.service.spec.ts
View File

@ -436,7 +436,7 @@ describe('QqbotNapcatContainerService', () => {
expect(withoutAccount).not.toContain('NAPCAT_QUICK_PASSWORD'); expect(withoutAccount).not.toContain('NAPCAT_QUICK_PASSWORD');
}); });
it('skips docker pull when recreating in place for quick login', () => { it('checks the local image before pulling when creating a container', () => {
const service = new QqbotNapcatContainerService( const service = new QqbotNapcatContainerService(
{ get: jest.fn().mockReturnValue('') } as any, { get: jest.fn().mockReturnValue('') } as any,
{} as any, {} as any,
@ -453,10 +453,21 @@ describe('QqbotNapcatContainerService', () => {
token: 'token-test', token: 'token-test',
}; };
expect(service.buildRemoteCreateScript(baseInput)).toContain('docker pull'); const createScript = service.buildRemoteCreateScript(baseInput);
expect( expect(createScript).toContain(
service.buildRemoteCreateScript({ ...baseInput, skipPull: true }), 'if ! docker image inspect "$IMAGE" >/dev/null 2>&1; then',
).not.toContain('docker pull'); );
expect(createScript).toContain('docker pull "$IMAGE" >/dev/null');
expect(createScript.indexOf('docker image inspect')).toBeLessThan(
createScript.indexOf('docker pull "$IMAGE"'),
);
const quickLoginScript = service.buildRemoteCreateScript({
...baseInput,
skipPull: true,
});
expect(quickLoginScript).not.toContain('docker image inspect "$IMAGE"');
expect(quickLoginScript).not.toContain('docker pull');
}); });
it('generates Chinese desktop runtime flags and account config files', () => { it('generates Chinese desktop runtime flags and account config files', () => {