diff --git a/package-lock.json b/package-lock.json index 76a91e30..a018a735 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,7 +56,7 @@ "common-tags": "^1.8.0", "copy-webpack-plugin": "^12.0.0", "deep-object-diff": "^1.1.0", - "docker-delta": "^4.0.1", + "docker-delta": "^4.1.0", "docker-progress": "^5.2.3", "dockerode": "^4.0.2", "duration-js": "^4.0.0", @@ -4507,9 +4507,9 @@ } }, "node_modules/docker-delta": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/docker-delta/-/docker-delta-4.0.1.tgz", - "integrity": "sha512-3HcgztB16CdjgXOcXM1ioLsR88SOKU8poz5r8eyxtayAigVPJGc9+PQqMPW+3rCwUAzSPzOuDgoQnMB7UtBe7g==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/docker-delta/-/docker-delta-4.1.0.tgz", + "integrity": "sha512-jiHhIvp7voOI32ZkFMsiJ/Naj5eb72IT9vP9Om7hQDW0vjbwvQQud1JHSxgzq97c/5uSIF37ojE1hehCAZZVIA==", "dev": true, "dependencies": { "bluebird": "^3.7.2", diff --git a/package.json b/package.json index ac3a73c2..a6831313 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "common-tags": "^1.8.0", "copy-webpack-plugin": "^12.0.0", "deep-object-diff": "^1.1.0", - "docker-delta": "^4.0.1", + "docker-delta": "^4.1.0", "docker-progress": "^5.2.3", "dockerode": "^4.0.2", "duration-js": "^4.0.0", diff --git a/src/lib/docker-utils.ts b/src/lib/docker-utils.ts index 2543dd30..25845154 100644 --- a/src/lib/docker-utils.ts +++ b/src/lib/docker-utils.ts @@ -327,7 +327,7 @@ async function applyRsyncDelta( } else if (parseInt(res.headers['content-length'] || '0', 10) === 0) { reject(new Error('Invalid delta URL')); } else { - const deltaStream = applyDelta(imgSrc, { + const deltaStream = applyDelta(docker, imgSrc, { log: logFn, timeout: applyTimeout, }); diff --git a/typings/docker-delta.d.ts b/typings/docker-delta.d.ts deleted file mode 100644 index 998ddc6b..00000000 --- a/typings/docker-delta.d.ts +++ /dev/null @@ -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; -}