diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 96e9a7a342..24a4993279 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { - "@balena/compose": "^3.0.5", + "@balena/compose": "^3.2.0", "@balena/dockerignore": "^1.0.2", "@balena/es-version": "^1.0.1", "@oclif/core": "^3.14.1", @@ -1409,18 +1409,16 @@ } }, "node_modules/@balena/compose": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@balena/compose/-/compose-3.0.5.tgz", - "integrity": "sha512-5w7aCvqKOTTwuosl39Y5+7lpjjr7k4Kx6dao01T0MAomFMlXsBNSzQjw50Xv5khkW7/DaKo0zMJnLsOq3YRDcw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@balena/compose/-/compose-3.2.0.tgz", + "integrity": "sha512-euzygRQadCEzd2j8xMPAMCcPogBAbF2o+f7vcNRXAdCP3q3u/bdBk7yXgWSaLmNilGqdsgeGS8WM0RxmXS9JYA==", "dependencies": { "ajv": "^6.12.3", - "bluebird": "^3.7.2", - "bluebird-lru-cache": "^1.0.1", "docker-file-parser": "^1.0.7", "docker-modem": "^3.0.3", "docker-progress": "^5.1.0", "dockerfile-ast": "^0.2.1", - "dockerode": "3.3.3", + "dockerode": "^3.3.5", "duplexify": "^4.1.2", "event-stream": "^4.0.1", "fp-ts": "^2.8.1", @@ -1431,8 +1429,10 @@ "JSONStream": "^1.3.5", "klaw": "^4.0.1", "lodash": "^4.17.19", + "memoizee": "^0.4.15", "mz": "^2.7.0", "p-map": "^4.0.0", + "pinejs-client-core": "^6.13.0", "pinejs-client-request": "^7.3.5", "request": "^2.88.2", "semver": "^7.3.5", @@ -1459,6 +1459,19 @@ "node": ">= 8.0" } }, + "node_modules/@balena/compose/node_modules/dockerode": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-3.3.5.tgz", + "integrity": "sha512-/0YNa3ZDNeLr/tSckmD69+Gq+qVNhvKfAHNeZJBnp7EOP6RGKV8ORrJHkUn20So5wU+xxT7+1n5u8PjHbfjbSA==", + "dependencies": { + "@balena/dockerignore": "^1.0.2", + "docker-modem": "^3.0.0", + "tar-fs": "~2.0.1" + }, + "engines": { + "node": ">= 8.0" + } + }, "node_modules/@balena/compose/node_modules/event-stream": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz", @@ -1518,6 +1531,32 @@ "node": ">= 10" } }, + "node_modules/@balena/compose/node_modules/tar-fs": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz", + "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==", + "dependencies": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.0.0" + } + }, + "node_modules/@balena/compose/node_modules/tar-fs/node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/@balena/compose/node_modules/tar-stream": { "version": "3.1.6", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz", @@ -5773,37 +5812,6 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "node_modules/bluebird-lru-cache": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bluebird-lru-cache/-/bluebird-lru-cache-1.0.1.tgz", - "integrity": "sha512-HdQ6UO5vSXG5qK/pE9srZTHCsvRzmzrn7g31XTcKq9JWMK0PG+LJ0mmR6LIYuXO5DeiR+DnLWMnMsYcd0WD2Bg==", - "dependencies": { - "bluebird": "^3.0.6", - "lru-cache": "^3.2.0", - "typed-error": "^2.0.0" - } - }, - "node_modules/bluebird-lru-cache/node_modules/lru-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz", - "integrity": "sha512-91gyOKTc2k66UG6kHiH4h3S2eltcPwE1STVfMYC/NG+nZwf8IIuiamfmpGZjpbbxzSyEJaLC0tNSmhjlQUTJow==", - "dependencies": { - "pseudomap": "^1.0.1" - } - }, - "node_modules/bluebird-lru-cache/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/bluebird-lru-cache/node_modules/typed-error": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/typed-error/-/typed-error-2.0.0.tgz", - "integrity": "sha512-uRrCO6P1KGYMZPykrmBaTnwuxEERymyDkO/WLfO8VcYt4MXw6RrcUoA/yYOt8T2RPZWULDtEKibR/Hlq8Hd4rA==", - "dependencies": { - "tslib": "^1.7.1" - } - }, "node_modules/bluebird-retry": { "version": "0.10.1", "resolved": "https://registry.npmjs.org/bluebird-retry/-/bluebird-retry-0.10.1.tgz", @@ -17648,11 +17656,6 @@ "node": ">= 0.10" } }, - "node_modules/pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" - }, "node_modules/psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", @@ -25753,18 +25756,16 @@ } }, "@balena/compose": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@balena/compose/-/compose-3.0.5.tgz", - "integrity": "sha512-5w7aCvqKOTTwuosl39Y5+7lpjjr7k4Kx6dao01T0MAomFMlXsBNSzQjw50Xv5khkW7/DaKo0zMJnLsOq3YRDcw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@balena/compose/-/compose-3.2.0.tgz", + "integrity": "sha512-euzygRQadCEzd2j8xMPAMCcPogBAbF2o+f7vcNRXAdCP3q3u/bdBk7yXgWSaLmNilGqdsgeGS8WM0RxmXS9JYA==", "requires": { "ajv": "^6.12.3", - "bluebird": "^3.7.2", - "bluebird-lru-cache": "^1.0.1", "docker-file-parser": "^1.0.7", "docker-modem": "^3.0.3", "docker-progress": "^5.1.0", "dockerfile-ast": "^0.2.1", - "dockerode": "3.3.3", + "dockerode": "^3.3.5", "duplexify": "^4.1.2", "event-stream": "^4.0.1", "fp-ts": "^2.8.1", @@ -25775,8 +25776,10 @@ "JSONStream": "^1.3.5", "klaw": "^4.0.1", "lodash": "^4.17.19", + "memoizee": "^0.4.15", "mz": "^2.7.0", "p-map": "^4.0.0", + "pinejs-client-core": "^6.13.0", "pinejs-client-request": "^7.3.5", "request": "^2.88.2", "semver": "^7.3.5", @@ -25797,6 +25800,16 @@ "ssh2": "^1.11.0" } }, + "dockerode": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-3.3.5.tgz", + "integrity": "sha512-/0YNa3ZDNeLr/tSckmD69+Gq+qVNhvKfAHNeZJBnp7EOP6RGKV8ORrJHkUn20So5wU+xxT7+1n5u8PjHbfjbSA==", + "requires": { + "@balena/dockerignore": "^1.0.2", + "docker-modem": "^3.0.0", + "tar-fs": "~2.0.1" + } + }, "event-stream": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz", @@ -25841,6 +25854,31 @@ "stream-to-array": "~2.3.0" } }, + "tar-fs": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz", + "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==", + "requires": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.0.0" + }, + "dependencies": { + "tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "requires": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + } + } + } + }, "tar-stream": { "version": "3.1.6", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz", @@ -29311,39 +29349,6 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "bluebird-lru-cache": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bluebird-lru-cache/-/bluebird-lru-cache-1.0.1.tgz", - "integrity": "sha512-HdQ6UO5vSXG5qK/pE9srZTHCsvRzmzrn7g31XTcKq9JWMK0PG+LJ0mmR6LIYuXO5DeiR+DnLWMnMsYcd0WD2Bg==", - "requires": { - "bluebird": "^3.0.6", - "lru-cache": "^3.2.0", - "typed-error": "^2.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz", - "integrity": "sha512-91gyOKTc2k66UG6kHiH4h3S2eltcPwE1STVfMYC/NG+nZwf8IIuiamfmpGZjpbbxzSyEJaLC0tNSmhjlQUTJow==", - "requires": { - "pseudomap": "^1.0.1" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "typed-error": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/typed-error/-/typed-error-2.0.0.tgz", - "integrity": "sha512-uRrCO6P1KGYMZPykrmBaTnwuxEERymyDkO/WLfO8VcYt4MXw6RrcUoA/yYOt8T2RPZWULDtEKibR/Hlq8Hd4rA==", - "requires": { - "tslib": "^1.7.1" - } - } - } - }, "bluebird-retry": { "version": "0.10.1", "resolved": "https://registry.npmjs.org/bluebird-retry/-/bluebird-retry-0.10.1.tgz", @@ -38465,11 +38470,6 @@ "ipaddr.js": "1.9.1" } }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" - }, "psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", diff --git a/package.json b/package.json index e456ee3cd4..e6093dc3a7 100644 --- a/package.json +++ b/package.json @@ -194,7 +194,7 @@ "typescript": "^5.3.2" }, "dependencies": { - "@balena/compose": "^3.0.5", + "@balena/compose": "^3.2.0", "@balena/dockerignore": "^1.0.2", "@balena/es-version": "^1.0.1", "@oclif/core": "^3.14.1",