@balena/compose 7.0.13 → 7.0.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
4
4
  automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
5
5
  This project adheres to [Semantic Versioning](http://semver.org/).
6
6
 
7
+ ## 7.0.14 - 2025-09-24
8
+
9
+ * Convert promise chains to async/await [Pagan Gazzard]
10
+
7
11
  ## 7.0.13 - 2025-09-24
8
12
 
9
13
  * Reduce lodash usage [Pagan Gazzard]
@@ -57,16 +57,20 @@ class Builder {
57
57
  dup.setReadable(outputStream);
58
58
  });
59
59
  })();
60
- Promise.all([
61
- buildPromise,
62
- this.callHook(hooks, 'buildStream', handler, dup),
63
- ])
64
- .then(() => {
65
- if (!streamError) {
66
- return this.callHook(hooks, 'buildSuccess', handler, _.last(layers), layers, fromTags);
60
+ void (async () => {
61
+ try {
62
+ await Promise.all([
63
+ buildPromise,
64
+ this.callHook(hooks, 'buildStream', handler, dup),
65
+ ]);
66
+ if (!streamError) {
67
+ return this.callHook(hooks, 'buildSuccess', handler, _.last(layers), layers, fromTags);
68
+ }
69
+ }
70
+ catch (err) {
71
+ void failBuild(err);
67
72
  }
68
- })
69
- .catch(failBuild);
73
+ })();
70
74
  return dup;
71
75
  }
72
76
  async buildDir(dirPath, buildOpts, hooks, handler = emptyHandler) {
@@ -1 +1 @@
1
- {"version":3,"file":"builder.js","sourceRoot":"","sources":["../../lib/build/builder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"builder.js","sourceRoot":"","sources":["../../lib/build/builder.ts"],"names":[],"mappings":"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"}
@@ -98,9 +98,9 @@ function transpose(dockerfile, options) {
98
98
  }
99
99
  const getTarEntryHandler = (pack, dockerfileName, opts) => {
100
100
  const streamToPromise = require('stream-to-promise');
101
- return (header, stream, next) => {
102
- streamToPromise(stream)
103
- .then((buffer) => {
101
+ return async (header, stream, next) => {
102
+ try {
103
+ const buffer = await streamToPromise(stream);
104
104
  const name = (0, tar_utils_1.normalizeTarEntry)(header.name);
105
105
  if (name === dockerfileName) {
106
106
  const newDockerfile = transpose(buffer.toString(), opts);
@@ -113,8 +113,10 @@ const getTarEntryHandler = (pack, dockerfileName, opts) => {
113
113
  pack.entry(header, buffer);
114
114
  }
115
115
  next();
116
- })
117
- .catch(next);
116
+ }
117
+ catch (e) {
118
+ next(e);
119
+ }
118
120
  };
119
121
  };
120
122
  function transposeTarStream(tarStream, options, dockerfileName = 'Dockerfile') {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/emulate/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/emulate/index.ts"],"names":[],"mappings":"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"}
@@ -66,31 +66,28 @@ async function runBuildTask(task, docker, registrySecrets, secrets, buildArgs) {
66
66
  if (task.external) {
67
67
  return (0, external_1.pullExternal)(task, docker);
68
68
  }
69
- const taskResolved = task.resolvedPromise ?? Promise.resolve();
70
- return new Promise((resolve, reject) => {
71
- taskResolved.then(() => {
72
- if (task.buildStream == null) {
73
- reject(new errors_1.BuildProcessError('Null build stream on non-external image'));
74
- return;
75
- }
76
- let dockerOpts = task.dockerOpts ?? {};
77
- dockerOpts = _.merge(dockerOpts, generateBuildArgs(task, buildArgs), generateLabels(task));
78
- if (secrets != null && task.serviceName in secrets) {
79
- dockerOpts.volumes ??= [];
80
- dockerOpts.volumes.push(`${secrets[task.serviceName].tmpDirectory}:/run/secrets:ro`);
81
- }
82
- if (task.tag != null) {
83
- dockerOpts = _.merge(dockerOpts, { t: task.tag });
84
- }
85
- if (task.dockerfilePath != null) {
86
- dockerOpts = _.merge(dockerOpts, {
87
- dockerfile: task.dockerfilePath,
88
- });
89
- }
90
- const builder = build_1.Builder.fromDockerode(docker);
91
- const hooks = taskHooks(task, docker, resolve);
92
- builder.createBuildStream(dockerOpts, hooks, reject);
69
+ await task.resolvedPromise;
70
+ if (task.buildStream == null) {
71
+ throw new errors_1.BuildProcessError('Null build stream on non-external image');
72
+ }
73
+ let dockerOpts = task.dockerOpts ?? {};
74
+ dockerOpts = _.merge(dockerOpts, generateBuildArgs(task, buildArgs), generateLabels(task));
75
+ if (secrets != null && task.serviceName in secrets) {
76
+ dockerOpts.volumes ??= [];
77
+ dockerOpts.volumes.push(`${secrets[task.serviceName].tmpDirectory}:/run/secrets:ro`);
78
+ }
79
+ if (task.tag != null) {
80
+ dockerOpts = _.merge(dockerOpts, { t: task.tag });
81
+ }
82
+ if (task.dockerfilePath != null) {
83
+ dockerOpts = _.merge(dockerOpts, {
84
+ dockerfile: task.dockerfilePath,
93
85
  });
86
+ }
87
+ const builder = build_1.Builder.fromDockerode(docker);
88
+ return new Promise((resolve, reject) => {
89
+ const hooks = taskHooks(task, docker, resolve);
90
+ builder.createBuildStream(dockerOpts, hooks, reject);
94
91
  });
95
92
  }
96
93
  async function checkAllowDockerPlatformHandling(task, docker) {
@@ -1 +1 @@
1
- {"version":3,"file":"build.js","sourceRoot":"","sources":["../../lib/multibuild/build.ts"],"names":[],"mappings":";;AAoHA,oCA4FC;AA9LD,4BAA4B;AAC5B,iCAAiC;AACjC,iCAAiC;AAGjC,oCAAmC;AAInC,qCAA6C;AAC7C,yCAA0C;AAC1C,+CAA2C;AAE3C,2CAIqB;AAErB,SAAS,SAAS,CACjB,IAAe,EACf,MAAiB,EACjB,OAAoC;IAEpC,IAAI,SAAiB,CAAC;IAEtB,MAAM,kBAAkB,GAAG,CAC1B,KAAiB,EACjB,MAAgB,EAChB,QAAuB,EACtB,EAAE;QACH,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;QACtB,KAAK,CAAC,aAAa,GAAG,QAAQ,CAAC;QAC/B,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;QAC5B,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;IACtC,CAAC,CAAC;IAEF,OAAO;QACN,YAAY,EAAE,CACb,OAAe,EACf,MAAgB,EAChB,QAAuB,EACtB,EAAE;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC;YAChC,MAAM,KAAK,GAAG,IAAI,wBAAU,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE;gBAC3D,QAAQ,EAAE,KAAK;gBACf,UAAU,EAAE,IAAI;aAChB,CAAC,CAAC;YACH,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC5C,OAAO,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC;QACD,YAAY,EAAE,CAAC,KAAY,EAAE,MAAgB,EAAE,QAAuB,EAAE,EAAE;YACzE,MAAM,KAAK,GAAG,IAAI,wBAAU,CAC3B,MAAM,EACN,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,EACzB,IAAI,CAAC,WAAW,EAChB,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CACtC,CAAC;YACF,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC5C,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;YACpB,OAAO,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC;QACD,WAAW,EAAE,CAAC,WAA0B,EAAE,EAAE;YAC3C,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,IAAI,OAAO,IAAI,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;gBAC3C,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAC9B,CAAC;YAED,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAY,EAAE,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QACzD,CAAC;KACD,CAAC;AACH,CAAC;AAED,MAAM,iBAAiB,GAAG,CACzB,IAAe,EACf,QAA6B,EACQ,EAAE;IACvC,OAAO;QACN,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,EAAE;KACxC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,IAAe,EAAmC,EAAE;IAC3E,OAAO;QACN,MAAM,EAAE,IAAI,CAAC,MAAM;KACnB,CAAC;AACH,CAAC,CAAC;AAUK,KAAK,UAAU,YAAY,CACjC,IAAe,EACf,MAAiB,EACjB,eAAgC,EAChC,OAA8B,EAC9B,SAA8B;IAc9B,MAAM,iBAAiB,GACtB,CAAC,CAAC,IAAI,CAAC,cAAc;QACrB,MAAM,CAAC,SAAS,CACf,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,OAAO,EAC7D,UAAU,CACV;QACD,CAAC,IAAI,CAAC,wCAAwC,KAAK,IAAI;YACtD,CAAC,MAAM,gCAAgC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IAE1D,IAAI,iBAAiB,EAAE,CAAC;QACvB,IAAI,CAAC,MAAM,EAAE,KAAK,CACjB,GAAG,IAAI,CAAC,WAAW,sCAAsC,IAAI,CAAC,cAAc,EAAE,CAC9E,CAAC;IACH,CAAC;IAED,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,KAAK,CACxB,iBAAiB,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,EAC1D,IAAI,CAAC,UAAU,EAGf,EAAE,cAAc,EAAE,eAAe,EAAE,CACnC,CAAC;IAEF,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEnB,OAAO,IAAA,uBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC;IAID,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAE/D,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAGtC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE;YACtB,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;gBAC9B,MAAM,CACL,IAAI,0BAAiB,CAAC,yCAAyC,CAAC,CAChE,CAAC;gBACF,OAAO;YACR,CAAC;YAED,IAAI,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;YACvC,UAAU,GAAG,CAAC,CAAC,KAAK,CACnB,UAAU,EACV,iBAAiB,CAAC,IAAI,EAAE,SAAS,CAAC,EAClC,cAAc,CAAC,IAAI,CAAC,CACpB,CAAC;YAEF,IAAI,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,WAAW,IAAI,OAAO,EAAE,CAAC;gBACpD,UAAU,CAAC,OAAO,KAAK,EAAE,CAAC;gBAC1B,UAAU,CAAC,OAAO,CAAC,IAAI,CACtB,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,YAAY,kBAAkB,CAC3D,CAAC;YACH,CAAC;YAED,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;gBACtB,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YACnD,CAAC;YAED,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,EAAE,CAAC;gBACjC,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE;oBAChC,UAAU,EAAE,IAAI,CAAC,cAAc;iBAC/B,CAAC,CAAC;YACJ,CAAC;YAED,MAAM,OAAO,GAAG,eAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAC9C,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YAE/C,OAAO,CAAC,iBAAiB,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC;AAmDD,KAAK,UAAU,gCAAgC,CAC9C,IAAe,EACf,MAAiB;IAEjB,MAAM,eAAe,GAAa,EAAE,CAAC;IAErC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;IAChE,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;IAE9D,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACpB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;SAAM,CAAC;QACP,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAEtB,KAAK,CACJ,GAAG,IAAI,CAAC,WAAW,qDAAqD,CACxE,CAAC;YACF,OAAO,KAAK,CAAC;QACd,CAAC;QACD,MAAM,EAAE,gBAAgB,EAAE,GAAG,2CAAa,gBAAgB,EAAC,CAAC;QAC5D,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjE,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,eAAe,EAAE,CAAC;QAC9D,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,MAAM,CACjD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,MAAM,CACtC,CAAC;QACF,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAEnC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,4CAA4C,CAAC,CAAC;YACvE,OAAO,KAAK,CAAC;QACd,CAAC;QAED,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,KAAK,MAAM,IAAI,IAAI,gBAAgB,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,EAAG,CAAC;gBAC1B,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC3B,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC1B,SAAS;gBACV,CAAC;gBAED,IAAI,GAAG,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC;oBAChC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;oBAC7B,IAAI,OAAO,EAAE,CAAC;wBACb,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;oBAC3C,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACzB,CAAC;YACF,CAAC;YAID,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;gBACjC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBACrC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC3B,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC;IAED,MAAM,4BAA4B,GAAa,EAAE,CAAC;IAClD,MAAM,yBAAyB,GAAa,EAAE,CAAC;IAE/C,MAAM,OAAO,CAAC,GAAG,CAChB,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QAC/B,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,MAAM,IAAA,uBAAW,EAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;YACrE,MAAM,kBAAkB,GAAG;gBAC1B,sCAA0B;gBAC1B,wCAA4B;aAC5B,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAC1C,IAAI,kBAAkB,EAAE,CAAC;gBACxB,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACP,4BAA4B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACtC,CAAC;QACF,CAAC;QAAC,MAAM,CAAC;YAER,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,yCAAyC,CAAC,EAAE,CAAC,CAAC;QACxE,CAAC;IACF,CAAC,CAAC,CACF,CAAC;IAEF,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1C,IAAI,4BAA4B,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAE/C,OAAO,IAAI,CAAC;QACb,CAAC;QAOD,IAAI,CAAC;WACI,IAAI,CAAC,WAAW;;;;MAIrB,4BAA4B,CAAC,IAAI,CAAC,QAAQ,CAAC;;MAE3C,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC;;;;;;;4CAOF,CAAC,CAAC;IAC7C,CAAC;IAGD,OAAO,KAAK,CAAC;AACd,CAAC"}
1
+ {"version":3,"file":"build.js","sourceRoot":"","sources":["../../lib/multibuild/build.ts"],"names":[],"mappings":"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"}
@@ -61,16 +61,16 @@ async function fromImageDescriptors(images, buildStream, metadataDirectories = [
61
61
  return new Promise((resolve, reject) => {
62
62
  const tasks = Utils.generateBuildTasks(images, buildMetadata);
63
63
  const extract = tar.extract();
64
- const entryFn = (header, entryStream, next) => {
65
- const matchingTasks = tasks.filter((task) => {
66
- if (task.external) {
67
- return false;
68
- }
69
- return (0, path_utils_1.posixContains)(task.context, header.name);
70
- });
71
- if (matchingTasks.length > 0) {
72
- TarUtils.streamToBuffer(entryStream)
73
- .then((buf) => {
64
+ extract.on('entry', async (header, entryStream, next) => {
65
+ try {
66
+ const matchingTasks = tasks.filter((task) => {
67
+ if (task.external) {
68
+ return false;
69
+ }
70
+ return (0, path_utils_1.posixContains)(task.context, header.name);
71
+ });
72
+ if (matchingTasks.length > 0) {
73
+ const buf = await TarUtils.streamToBuffer(entryStream);
74
74
  matchingTasks.forEach((task) => {
75
75
  const relative = path.posix.relative(task.context, header.name);
76
76
  if (contracts.isContractFile(relative)) {
@@ -83,30 +83,20 @@ async function fromImageDescriptors(images, buildStream, metadataDirectories = [
83
83
  newHeader.name = relative;
84
84
  task.buildStream.entry(newHeader, buf);
85
85
  });
86
- })
87
- .then(() => {
88
- next();
89
- return null;
90
- })
91
- .catch((e) => {
92
- if (e instanceof errors_1.ContractError) {
93
- reject(e);
94
- return;
95
- }
96
- reject(new errors_1.TarError(e));
97
- });
86
+ }
87
+ else {
88
+ await TarUtils.drainStream(entryStream);
89
+ }
90
+ next();
98
91
  }
99
- else {
100
- TarUtils.drainStream(entryStream)
101
- .then(() => {
102
- next();
103
- })
104
- .catch((e) => {
105
- reject(new errors_1.TarError(e));
106
- });
92
+ catch (e) {
93
+ if (e instanceof errors_1.ContractError) {
94
+ reject(e);
95
+ return;
96
+ }
97
+ reject(new errors_1.TarError(e));
107
98
  }
108
- };
109
- extract.on('entry', entryFn);
99
+ });
110
100
  extract.on('finish', () => {
111
101
  for (const task of tasks) {
112
102
  if (!task.external) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/multibuild/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/multibuild/index.ts"],"names":[],"mappings":"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"}
@@ -18,11 +18,14 @@ class LocalImage {
18
18
  }
19
19
  return this.daemon.getImage(this.name);
20
20
  }
21
- deleteImage() {
21
+ async deleteImage() {
22
22
  const image = this.getImage();
23
- return image.remove().catch((e) => {
23
+ try {
24
+ return await image.remove();
25
+ }
26
+ catch (e) {
24
27
  throw new errors_1.ImageRemovalError(e);
25
- });
28
+ }
26
29
  }
27
30
  }
28
31
  exports.LocalImage = LocalImage;
@@ -1 +1 @@
1
- {"version":3,"file":"local-image.js","sourceRoot":"","sources":["../../lib/multibuild/local-image.ts"],"names":[],"mappings":";;;AAmBA,qCAA6C;AAa7C,MAAa,UAAU;IA0EtB,YACC,MAAiB,EACjB,IAAmB,EACnB,WAAmB,EACnB,IAAe;QAEf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAClB,CAAC;IACF,CAAC;IAKM,QAAQ;QACd,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACzD,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAOM,WAAW;QACjB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACjC,MAAM,IAAI,0BAAiB,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;IACJ,CAAC;CACD;AA9GD,gCA8GC"}
1
+ {"version":3,"file":"local-image.js","sourceRoot":"","sources":["../../lib/multibuild/local-image.ts"],"names":[],"mappings":";;;AAmBA,qCAA6C;AAa7C,MAAa,UAAU;IA0EtB,YACC,MAAiB,EACjB,IAAmB,EACnB,WAAmB,EACnB,IAAe;QAEf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAClB,CAAC;IACF,CAAC;IAKM,QAAQ;QACd,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACzD,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAOM,KAAK,CAAC,WAAW;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC;YACJ,OAAO,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;QAC7B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,MAAM,IAAI,0BAAiB,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC;IACF,CAAC;CACD;AAhHD,gCAgHC"}
@@ -8,7 +8,7 @@ const getDeviceTypeVersions = memoize(async (deviceType) => {
8
8
  const tags = [];
9
9
  let nextUrl = `https://hub.docker.com/v2/repositories/resin/${deviceType}-node/tags/?page_size=100`;
10
10
  while (nextUrl != null) {
11
- const response = (await fetch(nextUrl).then((res) => res.json()));
11
+ const response = (await (await fetch(nextUrl)).json());
12
12
  const curr = response.results
13
13
  .map(({ name }) => name)
14
14
  .filter(versionTest);
@@ -1 +1 @@
1
- {"version":3,"file":"nodeResolver.js","sourceRoot":"","sources":["../../../lib/resolve/resolvers/nodeResolver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"nodeResolver.js","sourceRoot":"","sources":["../../../lib/resolve/resolvers/nodeResolver.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@balena/compose",
3
- "version": "7.0.13",
3
+ "version": "7.0.14",
4
4
  "description": "Complete toolkit to build docker-compose.yml files and optionally deploy them to balenaCloud",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -92,6 +92,6 @@
92
92
  "pinejs-client-core": "^6.14.13 || ^7.0.0 || ^8.0.0"
93
93
  },
94
94
  "versionist": {
95
- "publishedAt": "2025-09-24T10:52:07.758Z"
95
+ "publishedAt": "2025-09-24T11:24:29.238Z"
96
96
  }
97
97
  }