Merge pull request from balena-io/update-preload-10.4.1

Update preload 10.4.1
This commit is contained in:
bulldozer-balena[bot] 2020-12-29 10:56:43 +00:00 committed by GitHub
commit f69276e7c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 7 deletions

@ -2404,6 +2404,10 @@ disables check for matching architecture in image and application
pin the preloaded device to the preloaded release on provision
#### --additional-space ADDITIONAL-SPACE
expand the image by this amount of bytes instead of automatically estimating the required amount
#### --add-certificate ADD-CERTIFICATE
Add the given certificate (in PEM format) to /etc/ssl/certs in the preloading container.

@ -45,6 +45,7 @@ interface FlagsDef extends DockerConnectionCliFlags {
'splash-image'?: string;
'dont-check-arch': boolean;
'pin-device-to-release': boolean;
'additional-space'?: number;
'add-certificate'?: string[];
help: void;
}
@ -113,6 +114,11 @@ manually pinned using https://github.com/balena-io-projects/staged-releases .\
'pin the preloaded device to the preloaded release on provision',
char: 'p',
}),
'additional-space': flags.integer({
description:
'expand the image by this amount of bytes instead of automatically estimating the required amount',
parse: (x) => parseAsInteger(x, 'additional-space'),
}),
'add-certificate': flags.string({
description: `\
Add the given certificate (in PEM format) to /etc/ssl/certs in the preloading container.
@ -209,6 +215,7 @@ Can be repeated to add multiple certificates.\
const appId = options.app;
const splashImage = options['splash-image'];
const additionalSpace = options['additional-space'];
const dontCheckArch = options['dont-check-arch'] || false;
const pinDevice = options['pin-device-to-release'] || false;
@ -240,6 +247,7 @@ Can be repeated to add multiple certificates.\
dontCheckArch,
pinDevice,
certificates,
additionalSpace,
);
let gotSignal = false;

37
npm-shrinkwrap.json generated

@ -2631,9 +2631,9 @@
}
},
"balena-preload": {
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/balena-preload/-/balena-preload-10.3.1.tgz",
"integrity": "sha512-pz0IRzi2ByjgGROO9ryMlRI24RIp1IMfx7zcLyf99cOveOPFwCgu0N2CE8kkq9hnmlJuqqDoOYLqkoTJ5zv8xw==",
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/balena-preload/-/balena-preload-10.4.1.tgz",
"integrity": "sha512-/DHvtF7qPg3cfHfZxP3+EInqtqlwD/czTyIxBMnieZb/4UMISL/6fXPFsVYhxTwAeNmTsBaH+KTj4Owb5Lz5AA==",
"requires": {
"archiver": "^3.1.1",
"balena-sdk": "^15.3.1",
@ -2645,6 +2645,7 @@
"get-port": "^3.2.0",
"lodash": "^4.17.20",
"node-cleanup": "^2.1.2",
"request-promise": "^4.2.6",
"resin-cli-visuals": "^1.7.0",
"tar-fs": "^2.1.0",
"tmp": "0.0.33",
@ -3213,9 +3214,9 @@
"integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
},
"buffer-indexof-polyfill": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.1.tgz",
"integrity": "sha1-qfuAbOgUXVQoUQznLyeLs2OmOL8="
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
"integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A=="
},
"buffer-shims": {
"version": "1.0.0",
@ -13332,6 +13333,25 @@
"throttleit": "^1.0.0"
}
},
"request-promise": {
"version": "4.2.6",
"resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz",
"integrity": "sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ==",
"requires": {
"bluebird": "^3.5.0",
"request-promise-core": "1.1.4",
"stealthy-require": "^1.1.1",
"tough-cookie": "^2.3.3"
}
},
"request-promise-core": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
"integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
"requires": {
"lodash": "^4.17.19"
}
},
"require-directory": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@ -14528,6 +14548,11 @@
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
"integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
},
"stealthy-require": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
"integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
},
"stream-chunker": {
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/stream-chunker/-/stream-chunker-1.2.8.tgz",

@ -199,7 +199,7 @@
"balena-device-init": "^5.0.2",
"balena-errors": "^4.7.1",
"balena-image-manager": "^7.0.3",
"balena-preload": "^10.3.1",
"balena-preload": "^10.4.1",
"balena-release": "^3.0.0",
"balena-sdk": "^15.20.0",
"balena-semver": "^2.3.0",