@balena/compose 3.0.1 → 3.0.2

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,11 @@ 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
+ ## 3.0.2 - 2023-07-11
8
+
9
+ * Remove `cachefrom` from pull options [Felipe Lalanne]
10
+ * Skip manifest query for intermediate build stages [Felipe Lalanne]
11
+
7
12
  ## 3.0.1 - 2023-07-07
8
13
 
9
14
  * Use native map where possible [Pagan Gazzard]
@@ -115,12 +115,29 @@ async function checkAllowDockerPlatformHandling(task, docker) {
115
115
  debug(`${task.serviceName}: Dockerfile does not reference any images`);
116
116
  return false;
117
117
  }
118
+ const potentialRefs = [];
119
+ const intermediateRefs = [];
118
120
  for (const inst of fromInstructions) {
119
- for (const arg of inst.getArguments()) {
121
+ const args = inst.getArguments();
122
+ while (args.length > 0) {
123
+ const arg = args.shift();
120
124
  const val = arg.getValue();
121
- if (!val.startsWith('--')) {
122
- imageReferences.push(val);
123
- break;
125
+ if (val.startsWith('--')) {
126
+ continue;
127
+ }
128
+ if (val.toLowerCase() === 'as') {
129
+ const nextArg = args.shift();
130
+ if (nextArg) {
131
+ intermediateRefs.push(nextArg.getValue());
132
+ }
133
+ }
134
+ else {
135
+ potentialRefs.push(val);
136
+ }
137
+ }
138
+ for (const ref of potentialRefs) {
139
+ if (!intermediateRefs.includes(ref)) {
140
+ imageReferences.push(ref);
124
141
  }
125
142
  }
126
143
  }
@@ -1 +1 @@
1
- {"version":3,"file":"build.js","sourceRoot":"","sources":["../../lib/multibuild/build.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"build.js","sourceRoot":"","sources":["../../lib/multibuild/build.ts"],"names":[],"mappings":"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"}
@@ -30,7 +30,8 @@ async function pullExternal(task, docker) {
30
30
  if (authConfig && Object.keys(authConfig).length > 0) {
31
31
  opts.authconfig = authConfig;
32
32
  }
33
- await dockerProgress.pull(imageName, progressHook, opts);
33
+ const { cachefrom, ...pullOpts } = opts;
34
+ await dockerProgress.pull(imageName, progressHook, pullOpts);
34
35
  const image = new local_image_1.LocalImage(docker, imageName, task.serviceName, {
35
36
  external: true,
36
37
  successful: true,
@@ -1 +1 @@
1
- {"version":3,"file":"external.js","sourceRoot":"","sources":["../../lib/multibuild/external.ts"],"names":[],"mappings":";;;AAgBA,qDAAiD;AAEjD,4BAA4B;AAG5B,qCAA6C;AAC7C,+CAA2C;AAC3C,yDAAsD;AAEtD,MAAM,WAAW,GAAG,CAAC,IAAY,EAAW,EAAE;IAC7C,MAAM,QAAQ,GAAG,YAAY,CAAC;IAC9B,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC,CAAC;AAOK,KAAK,UAAU,YAAY,CACjC,IAAe,EACf,MAAiB;IAEjB,MAAM,cAAc,GAAG,IAAI,gCAAc,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAEtD,MAAM,YAAY,GACjB,OAAO,IAAI,CAAC,YAAY,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEtE,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE;QAC3B,MAAM,IAAI,0BAAiB,CAAC,2CAA2C,CAAC,CAAC;KACzE;IACD,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IAE/B,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE;QAC5B,SAAS,IAAI,SAAS,CAAC;KACvB;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;IACnC,IAAI,UAAU,GAAwB,EAAE,CAAC;IACzC,IAAI,IAAI,CAAC,cAAc,EAAE;QACxB,UAAU,GAAG,IAAA,mCAAgB,EAAC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;KAC9D;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,IAAI;QACH,IAAI,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACrD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;SAC7B;QACD,MAAM,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;QACzD,MAAM,KAAK,GAAG,IAAI,wBAAU,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,WAAW,EAAE;YACjE,QAAQ,EAAE,IAAI;YACd,UAAU,EAAE,IAAI;SAChB,CAAC,CAAC;QACH,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;QAC5B,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,KAAK,CAAC,WAAW,GAAG,kBAAkB,CAAC;QACvC,OAAO,KAAK,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACX,MAAM,KAAK,GAAG,IAAI,wBAAU,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE;YAC5D,QAAQ,EAAE,IAAI;YACd,UAAU,EAAE,KAAK;SACjB,CAAC,CAAC;QACH,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC;QAChB,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;QAC5B,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,KAAK,CAAC,WAAW,GAAG,kBAAkB,CAAC;QACvC,OAAO,KAAK,CAAC;KACb;AACF,CAAC;AAjDD,oCAiDC"}
1
+ {"version":3,"file":"external.js","sourceRoot":"","sources":["../../lib/multibuild/external.ts"],"names":[],"mappings":";;;AAgBA,qDAAiD;AAEjD,4BAA4B;AAG5B,qCAA6C;AAC7C,+CAA2C;AAC3C,yDAAsD;AAEtD,MAAM,WAAW,GAAG,CAAC,IAAY,EAAW,EAAE;IAC7C,MAAM,QAAQ,GAAG,YAAY,CAAC;IAC9B,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC,CAAC;AAOK,KAAK,UAAU,YAAY,CACjC,IAAe,EACf,MAAiB;IAEjB,MAAM,cAAc,GAAG,IAAI,gCAAc,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAEtD,MAAM,YAAY,GACjB,OAAO,IAAI,CAAC,YAAY,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEtE,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE;QAC3B,MAAM,IAAI,0BAAiB,CAAC,2CAA2C,CAAC,CAAC;KACzE;IACD,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IAE/B,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE;QAC5B,SAAS,IAAI,SAAS,CAAC;KACvB;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;IACnC,IAAI,UAAU,GAAwB,EAAE,CAAC;IACzC,IAAI,IAAI,CAAC,cAAc,EAAE;QACxB,UAAU,GAAG,IAAA,mCAAgB,EAAC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;KAC9D;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,IAAI;QACH,IAAI,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YACrD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;SAC7B;QAGD,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAC;QACxC,MAAM,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC7D,MAAM,KAAK,GAAG,IAAI,wBAAU,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,WAAW,EAAE;YACjE,QAAQ,EAAE,IAAI;YACd,UAAU,EAAE,IAAI;SAChB,CAAC,CAAC;QACH,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;QAC5B,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,KAAK,CAAC,WAAW,GAAG,kBAAkB,CAAC;QACvC,OAAO,KAAK,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACX,MAAM,KAAK,GAAG,IAAI,wBAAU,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE;YAC5D,QAAQ,EAAE,IAAI;YACd,UAAU,EAAE,KAAK;SACjB,CAAC,CAAC;QACH,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC;QAChB,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;QAC5B,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,KAAK,CAAC,WAAW,GAAG,kBAAkB,CAAC;QACvC,OAAO,KAAK,CAAC;KACb;AACF,CAAC;AApDD,oCAoDC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@balena/compose",
3
- "version": "3.0.1",
3
+ "version": "3.0.2",
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",
@@ -93,6 +93,6 @@
93
93
  "typed-error": "^3.2.1"
94
94
  },
95
95
  "versionist": {
96
- "publishedAt": "2023-07-07T16:19:08.941Z"
96
+ "publishedAt": "2023-07-11T14:31:55.571Z"
97
97
  }
98
98
  }