ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-02 07:40:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2350 from balena-os/instanceof-error

Browse Source 
Remove custom typings for docker-delta
This commit is contained in:
flowzone-app[bot] 2024-07-05 21:12:53 +00:00 committed by GitHub
commit 55a81aaeb2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package-lock.json generated
View File

@ -56,7 +56,7 @@
"common-tags": "^1.8.0", "common-tags": "^1.8.0",
"copy-webpack-plugin": "^12.0.0", "copy-webpack-plugin": "^12.0.0",
"deep-object-diff": "^1.1.0", "deep-object-diff": "^1.1.0",
"docker-delta": "^4.0.1", "docker-delta": "^4.1.0",
"docker-progress": "^5.2.3", "docker-progress": "^5.2.3",
"dockerode": "^4.0.2", "dockerode": "^4.0.2",
"duration-js": "^4.0.0", "duration-js": "^4.0.0",
@ -4507,9 +4507,9 @@
} }
}, },
"node_modules/docker-delta": { "node_modules/docker-delta": {
"version": "4.0.1", "version": "4.1.0",
"resolved": "https://registry.npmjs.org/docker-delta/-/docker-delta-4.0.1.tgz", "resolved": "https://registry.npmjs.org/docker-delta/-/docker-delta-4.1.0.tgz",
"integrity": "sha512-3HcgztB16CdjgXOcXM1ioLsR88SOKU8poz5r8eyxtayAigVPJGc9+PQqMPW+3rCwUAzSPzOuDgoQnMB7UtBe7g==", "integrity": "sha512-jiHhIvp7voOI32ZkFMsiJ/Naj5eb72IT9vP9Om7hQDW0vjbwvQQud1JHSxgzq97c/5uSIF37ojE1hehCAZZVIA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"bluebird": "^3.7.2", "bluebird": "^3.7.2",

2
package.json
View File

@ -82,7 +82,7 @@
"common-tags": "^1.8.0", "common-tags": "^1.8.0",
"copy-webpack-plugin": "^12.0.0", "copy-webpack-plugin": "^12.0.0",
"deep-object-diff": "^1.1.0", "deep-object-diff": "^1.1.0",
"docker-delta": "^4.0.1", "docker-delta": "^4.1.0",
"docker-progress": "^5.2.3", "docker-progress": "^5.2.3",
"dockerode": "^4.0.2", "dockerode": "^4.0.2",
"duration-js": "^4.0.0", "duration-js": "^4.0.0",

2
src/lib/docker-utils.ts
View File

@ -327,7 +327,7 @@ async function applyRsyncDelta(
} else if (parseInt(res.headers['content-length'] || '0', 10) === 0) { } else if (parseInt(res.headers['content-length'] || '0', 10) === 0) {
reject(new Error('Invalid delta URL')); reject(new Error('Invalid delta URL'));
} else { } else {
const deltaStream = applyDelta(imgSrc, { const deltaStream = applyDelta(docker, imgSrc, {
log: logFn, log: logFn,
timeout: applyTimeout, timeout: applyTimeout,
}); });

12
typings/docker-delta.d.ts vendored
View File

@ -1,12 +0,0 @@
declare module 'docker-delta' {
// Incomplete type definitions
import type { Duplex } from 'stream';
import { TypedError } from 'typed-error';
export class OutOfSyncError extends TypedError {}
export function applyDelta(
imageSource: string,
opts: { log: (str: string) => void; timeout: number },
): Duplex;
}