@balena/compose 3.0.0 → 3.0.1
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 +14 -0
- package/dist/build/builder.js +2 -2
- package/dist/build/builder.js.map +1 -1
- package/dist/emulate/index.js +3 -3
- package/dist/emulate/index.js.map +1 -1
- package/dist/multibuild/build-metadata.js +2 -2
- package/dist/multibuild/build-metadata.js.map +1 -1
- package/dist/multibuild/build.js +1 -1
- package/dist/multibuild/build.js.map +1 -1
- package/dist/multibuild/external.js +1 -3
- package/dist/multibuild/external.js.map +1 -1
- package/dist/multibuild/index.js +2 -2
- package/dist/multibuild/index.js.map +1 -1
- package/dist/multibuild/utils.js +2 -2
- package/dist/multibuild/utils.js.map +1 -1
- package/dist/multibuild/validation-types/varlist.js +5 -5
- package/dist/multibuild/validation-types/varlist.js.map +1 -1
- package/dist/parse/compose.js +17 -16
- package/dist/parse/compose.js.map +1 -1
- package/dist/resolve/index.js +1 -4
- package/dist/resolve/index.js.map +1 -1
- package/dist/resolve/resolvers/nodeResolver.js +5 -6
- package/dist/resolve/resolvers/nodeResolver.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,20 @@ 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.1 - 2023-07-07
|
|
8
|
+
|
|
9
|
+
* Use native map where possible [Pagan Gazzard]
|
|
10
|
+
* Use native filter [Pagan Gazzard]
|
|
11
|
+
* Use native endsWith [Pagan Gazzard]
|
|
12
|
+
* Use native includes [Pagan Gazzard]
|
|
13
|
+
* Use native Object.assign [Pagan Gazzard]
|
|
14
|
+
* Use native Object.keys [Pagan Gazzard]
|
|
15
|
+
* Switch to native null check [Pagan Gazzard]
|
|
16
|
+
* Switch to native object check [Pagan Gazzard]
|
|
17
|
+
* Switch to native string check [Pagan Gazzard]
|
|
18
|
+
* Switch to native function check [Pagan Gazzard]
|
|
19
|
+
* Switch to native Array.isArray [Pagan Gazzard]
|
|
20
|
+
|
|
7
21
|
## 3.0.0 - 2023-07-05
|
|
8
22
|
|
|
9
23
|
* Switch to returning native promises, not bluebird promises [Pagan Gazzard]
|
package/dist/build/builder.js
CHANGED
|
@@ -83,12 +83,12 @@ class Builder {
|
|
|
83
83
|
async callHook(hooks, hook, handler, ...args) {
|
|
84
84
|
try {
|
|
85
85
|
const fn = hooks[hook];
|
|
86
|
-
if (
|
|
86
|
+
if (typeof fn === 'function') {
|
|
87
87
|
return await fn.apply(null, args);
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
90
|
catch (err) {
|
|
91
|
-
if (
|
|
91
|
+
if (typeof handler === 'function') {
|
|
92
92
|
handler(err);
|
|
93
93
|
}
|
|
94
94
|
throw err;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../lib/build/builder.ts"],"names":[],"mappings":";;AAiBA,uCAAuC;AACvC,uCAAuC;AACvC,mCAAmC;AACnC,yCAAyC;AACzC,4BAA4B;AAC5B,4BAA4B;AAC5B,6BAA6B;AAE7B,kCAAkC;AAIlC,iCAAiC;AAGjC,MAAM,YAAY,GAAiB,GAAG,EAAE,CAAC,SAAS,CAAC;AASnD,MAAqB,OAAO;IAG3B,YAAoB,MAAiB;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,MAAiB;QAC5C,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,UAAmC;QAC/D,OAAO,IAAI,OAAO,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;IAC/C,CAAC;IAUM,iBAAiB,CACvB,SAAiC,EACjC,QAA2B,EAAE,EAC7B,UAAwB,YAAY;QAEpC,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAwB,EAAE,CAAC;QAGzC,MAAM,WAAW,GAAG,EAAE,CAAC,OAAO,EAAU,CAAC;QAGzC,MAAM,GAAG,GAAG,SAAS,EAAE,CAAC;QAGxB,GAAG,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAE7B,IAAI,WAAkB,CAAC;QACvB,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAU,EAAE,EAAE;YACvC,WAAW,GAAG,GAAG,CAAC;YAClB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO,IAAI,CAAC,QAAQ,CACnB,KAAK,EACL,cAAc,EACd,OAAO,EACP,GAAG,EACH,MAAM,EACN,QAAQ,CACR,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACnC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAE3B,MAAM,YAAY,GAAG,CAAC,KAAK,IAAI,EAAE;YAChC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../lib/build/builder.ts"],"names":[],"mappings":"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"}
|
package/dist/emulate/index.js
CHANGED
|
@@ -32,7 +32,7 @@ const transposeStringRun = (options, command) => {
|
|
|
32
32
|
};
|
|
33
33
|
};
|
|
34
34
|
const transposeRun = (options, command) => {
|
|
35
|
-
if (
|
|
35
|
+
if (Array.isArray(command.args)) {
|
|
36
36
|
return transposeArrayRun(options, command);
|
|
37
37
|
}
|
|
38
38
|
return transposeStringRun(options, command);
|
|
@@ -48,7 +48,7 @@ const commandToTranspose = (command) => {
|
|
|
48
48
|
};
|
|
49
49
|
const spaceSeparatedArrayCommands = ['ARG', 'EXPOSE'];
|
|
50
50
|
const argsToString = (args, commandName) => {
|
|
51
|
-
if (
|
|
51
|
+
if (Array.isArray(args)) {
|
|
52
52
|
let ret = '';
|
|
53
53
|
if (args[0] != null && args[0].startsWith('--')) {
|
|
54
54
|
ret += args[0] + ' ';
|
|
@@ -59,7 +59,7 @@ const argsToString = (args, commandName) => {
|
|
|
59
59
|
}
|
|
60
60
|
return ret + '["' + args.join('","') + '"]';
|
|
61
61
|
}
|
|
62
|
-
else if (
|
|
62
|
+
else if (args != null && typeof args === 'object') {
|
|
63
63
|
return _.map(args, (value, key) => {
|
|
64
64
|
const escapedValue = JSON.stringify(value);
|
|
65
65
|
return `${key}=${escapedValue}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/emulate/index.ts"],"names":[],"mappings":";;;AAiBA,6CAA6C;AAC7C,+BAA+B;AAC/B,4BAA4B;AAC5B,kCAAkC;AAClC,yCAA8C;AA+B9C,MAAM,gBAAgB,GAAG,CAAC,OAAyB,EAAW,EAAE;IAC/D,OAAO;QACN,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,iBAAiB,CAAC;KACvD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,SAAiB,EAAE,EAAE;IAC9C,OAAO,KAAK,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CACzB,OAAyB,EACzB,OAAgB,EACN,EAAE;IACZ,MAAM,IAAI,GAAI,OAAO,CAAC,IAAiB,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxE,OAAO;QACN,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;KAC1E,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAC1B,OAAyB,EACzB,OAAgB,EACN,EAAE;IACZ,MAAM,SAAS,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAc,CAAC,CAAC;IAC3D,OAAO;QACN,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC;YACpE,SAAS;SACT,CAAC;KACF,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,OAAyB,EAAE,OAAgB,EAAW,EAAE;IAC7E,IAAI,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/emulate/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -103,11 +103,11 @@ class BuildMetadata {
|
|
|
103
103
|
getBuildVarsForService(serviceName) {
|
|
104
104
|
const vars = {};
|
|
105
105
|
if (this.balenaYml.buildVariables.global != null) {
|
|
106
|
-
|
|
106
|
+
Object.assign(vars, this.balenaYml.buildVariables.global);
|
|
107
107
|
}
|
|
108
108
|
const services = this.balenaYml.buildVariables.services;
|
|
109
109
|
if (services != null && serviceName in services) {
|
|
110
|
-
|
|
110
|
+
Object.assign(vars, services[serviceName]);
|
|
111
111
|
}
|
|
112
112
|
return vars;
|
|
113
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-metadata.js","sourceRoot":"","sources":["../../lib/multibuild/build-metadata.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"build-metadata.js","sourceRoot":"","sources":["../../lib/multibuild/build-metadata.ts"],"names":[],"mappings":"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"}
|
package/dist/multibuild/build.js
CHANGED
|
@@ -36,7 +36,7 @@ function taskHooks(task, docker, resolve) {
|
|
|
36
36
|
},
|
|
37
37
|
buildStream: (stream) => {
|
|
38
38
|
startTime = Date.now();
|
|
39
|
-
if (
|
|
39
|
+
if (typeof task.streamHook === 'function') {
|
|
40
40
|
task.streamHook(stream);
|
|
41
41
|
}
|
|
42
42
|
task.buildStream.pipe(stream);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../lib/multibuild/build.ts"],"names":[],"mappings":";;;AAkBA,4BAA4B;AAC5B,iCAAiC;AAGjC,oCAA4D;AAI5D,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,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;YAClD,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,MAAqB,EAAE,EAAE;YACtC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,IAAI,
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../lib/multibuild/build.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,9 +12,7 @@ const hasImageTag = (name) => {
|
|
|
12
12
|
};
|
|
13
13
|
async function pullExternal(task, docker) {
|
|
14
14
|
const dockerProgress = new docker_progress_1.DockerProgress({ docker });
|
|
15
|
-
const progressHook =
|
|
16
|
-
? task.progressHook
|
|
17
|
-
: _.noop;
|
|
15
|
+
const progressHook = typeof task.progressHook === 'function' ? task.progressHook : _.noop;
|
|
18
16
|
if (task.imageName == null) {
|
|
19
17
|
throw new errors_1.BuildProcessError('No image name given for an external image');
|
|
20
18
|
}
|
|
@@ -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,
|
|
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"}
|
package/dist/multibuild/index.js
CHANGED
|
@@ -54,7 +54,7 @@ async function fromImageDescriptors(images, buildStream, metadataDirectories = [
|
|
|
54
54
|
const tasks = Utils.generateBuildTasks(images, buildMetadata);
|
|
55
55
|
const extract = tar.extract();
|
|
56
56
|
const entryFn = (header, stream, next) => {
|
|
57
|
-
const matchingTasks =
|
|
57
|
+
const matchingTasks = tasks.filter((task) => {
|
|
58
58
|
if (task.external) {
|
|
59
59
|
return false;
|
|
60
60
|
}
|
|
@@ -165,7 +165,7 @@ async function initializeBuildMetadata(tasks, docker, tmpDir) {
|
|
|
165
165
|
const architecture = (await docker.version()).Arch;
|
|
166
166
|
buildMetadata.parseMetadata();
|
|
167
167
|
const registrySecrets = buildMetadata.registrySecrets;
|
|
168
|
-
const secretMap = (0, build_secrets_1.generateSecretPopulationMap)(
|
|
168
|
+
const secretMap = (0, build_secrets_1.generateSecretPopulationMap)(tasks.map((t) => t.serviceName), buildMetadata, tmpDir);
|
|
169
169
|
const hasSecrets = !_.isEmpty(secretMap);
|
|
170
170
|
if (hasSecrets) {
|
|
171
171
|
await (0, build_secrets_1.populateSecrets)(docker, secretMap, architecture, tmpDir);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/multibuild/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAkBA,4BAA4B;AAC5B,6BAA6B;AAE7B,kCAAkC;AAClC,sCAAsC;AAEtC,oCAAoC;AAEpC,mCAAuC;AACvC,qDAA6C;AAC7C,mDAOyB;AAEzB,yCAAyC;AACzC,qCAMkB;AAElB,0CAA0C;AAcjC,8BAAS;AAblB,6CAA6C;AAE7C,uCAA0D;AAC1D,iCAAiC;AAEjC,mDAAiD;AAAxC,+GAAA,aAAa,OAAA;AACtB,+CAA6B;AAC7B,2CAAyB;AACzB,gDAA8B;AAC9B,qDAAmC;AACnC,qCAAkD;AAAzC,gHAAA,qBAAqB,OAAA;AAC9B,iCAA6C;AAApC,2GAAA,kBAAkB,OAAA;AAI3B,yCAAgD;AAAvC,8GAAA,iBAAiB,OAAA;AAW1B,SAAgB,gBAAgB,CAC/B,WAAgC,EAChC,WAA4B;IAE5B,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC1C,OAAO,oBAAoB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAClD,CAAC;AAND,4CAMC;AAEM,KAAK,UAAU,oBAAoB,CACzC,MAAiC,EACjC,WAA4B,EAC5B,mBAAmB,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC;IAE7C,MAAM,aAAa,GAAG,IAAI,wBAAa,CAAC,mBAAmB,CAAC,CAAC;IAE7D,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAEnE,OAAO,IAAI,OAAO,CAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAEnD,MAAM,KAAK,GAAG,KAAK,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAE9D,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;QAE9B,MAAM,OAAO,GAAG,CACf,MAAmB,EACnB,MAAuB,EACvB,IAAgB,EACT,EAAE;YAET,MAAM,aAAa,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/multibuild/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAkBA,4BAA4B;AAC5B,6BAA6B;AAE7B,kCAAkC;AAClC,sCAAsC;AAEtC,oCAAoC;AAEpC,mCAAuC;AACvC,qDAA6C;AAC7C,mDAOyB;AAEzB,yCAAyC;AACzC,qCAMkB;AAElB,0CAA0C;AAcjC,8BAAS;AAblB,6CAA6C;AAE7C,uCAA0D;AAC1D,iCAAiC;AAEjC,mDAAiD;AAAxC,+GAAA,aAAa,OAAA;AACtB,+CAA6B;AAC7B,2CAAyB;AACzB,gDAA8B;AAC9B,qDAAmC;AACnC,qCAAkD;AAAzC,gHAAA,qBAAqB,OAAA;AAC9B,iCAA6C;AAApC,2GAAA,kBAAkB,OAAA;AAI3B,yCAAgD;AAAvC,8GAAA,iBAAiB,OAAA;AAW1B,SAAgB,gBAAgB,CAC/B,WAAgC,EAChC,WAA4B;IAE5B,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC1C,OAAO,oBAAoB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAClD,CAAC;AAND,4CAMC;AAEM,KAAK,UAAU,oBAAoB,CACzC,MAAiC,EACjC,WAA4B,EAC5B,mBAAmB,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC;IAE7C,MAAM,aAAa,GAAG,IAAI,wBAAa,CAAC,mBAAmB,CAAC,CAAC;IAE7D,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAEnE,OAAO,IAAI,OAAO,CAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAEnD,MAAM,KAAK,GAAG,KAAK,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAE9D,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;QAE9B,MAAM,OAAO,GAAG,CACf,MAAmB,EACnB,MAAuB,EACvB,IAAgB,EACT,EAAE;YAET,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC3C,IAAI,IAAI,CAAC,QAAQ,EAAE;oBAClB,OAAO,KAAK,CAAC;iBACb;gBACD,OAAO,IAAA,0BAAa,EAAC,IAAI,CAAC,OAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC;YAEH,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBAE7B,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC;qBAC7B,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;oBACb,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;wBAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;wBAKjE,IAAI,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE;4BACvC,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE;gCAC1B,MAAM,IAAI,oCAA2B,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;6BACxD;4BACD,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;yBAC/C;wBAED,MAAM,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;wBACtC,SAAS,CAAC,IAAI,GAAG,QAAQ,CAAC;wBAC1B,IAAI,CAAC,WAAY,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;oBACzC,CAAC,CAAC,CAAC;gBACJ,CAAC,CAAC;qBACD,IAAI,CAAC,GAAG,EAAE;oBACV,IAAI,EAAE,CAAC;oBACP,OAAO,IAAI,CAAC;gBACb,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;oBACZ,IAAI,CAAC,YAAY,sBAAa,EAAE;wBAC/B,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;qBACjB;oBACD,MAAM,CAAC,IAAI,iBAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACN,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC;qBAC1B,IAAI,CAAC,GAAG,EAAE;oBACV,IAAI,EAAE,CAAC;gBACR,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,iBAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACxC;QACF,CAAC,CAAC;QAEF,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC7B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACzB,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE;gBACtB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;oBACnB,IAAI,CAAC,WAAY,CAAC,QAAQ,EAAE,CAAC;iBAC7B;YACF,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YACzB,MAAM,CAAC,IAAI,iBAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QACjB,SAAS,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;QAC1C,OAAO,KAAK,CAAC;IACd,CAAC,CAAC,CAAC;AACJ,CAAC;AAvFD,oDAuFC;AAED,SAAgB,eAAe,CAAC,KAAkB;IACjD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,KAAK,CAAC;KACb;IAED,OAAO,CAAC,CAAC,CAAC,OAAO,CAChB,IAAA,2CAA2B,EAC1B,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,CAAC,EAC3B,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,EACtB,MAAM,CACN,CACD,CAAC;AACH,CAAC;AAZD,0CAYC;AAsBD,SAAgB,iBAAiB,CAChC,KAAkB,EAClB,YAAoB,EACpB,UAAkB,EAClB,gBAAkC,EAClC,sBAA2C,EAC3C,wBAAyD;IAEzD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACzB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,OAAO,IAAA,qBAAW,EACjB,IAAI,EACJ,YAAY,EACZ,UAAU,EACV,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,CACxB,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC;AAnBD,8CAmBC;AAED,SAAgB,uBAAuB,CACtC,IAAe,EACf,YAAoB,EACpB,UAAkB,EAClB,gBAAkC,EAClC,sBAA2C,EAC3C,wBAAyD;IAEzD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACjC,OAAO,IAAA,qBAAW,EACjB,IAAI,EACJ,YAAY,EACZ,UAAU,EACV,gBAAgB,EAChB,sBAAsB,EACtB,wBAAwB,CACxB,CAAC;AACH,CAAC;AAjBD,0DAiBC;AAcM,KAAK,UAAU,aAAa,CAClC,KAAkB,EAClB,MAAiB,EACjB,MAAc;IAEd,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,EAAE,CAAC;KACV;IACD,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;IAE7C,MAAM,EACL,OAAO,EAAE,SAAS,EAClB,UAAU,EAAE,eAAe,EAC3B,YAAY,GACZ,GAAG,MAAM,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAEzD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAe,EAAE,EAAE;QACnC,OAAO,MAAM,kBAAkB,CAC9B,IAAI,EACJ,MAAM,EACN,eAAe,EACf,SAAS,EACT,aAAa,CAAC,sBAAsB,CAAC,IAAI,CAAC,WAAW,CAAC,CACtD,CAAC;IACH,CAAC,CAAC,CACF,CAAC;IAEF,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC1B,IAAI;YACH,MAAM,IAAA,6BAAa,EAAC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;SAC7D;QAAC,OAAO,CAAC,EAAE;YACX,MAAM,IAAI,2BAAkB,CAAC,CAAC,CAAC,CAAC;SAChC;KACD;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AApCD,sCAoCC;AAEM,KAAK,UAAU,uBAAuB,CAC5C,KAAkB,EAClB,MAAiB,EACjB,MAAc;IAMd,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO;YACN,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,EAAE;YACd,YAAY,EAAE,EAAE;SAChB,CAAC;KACF;IAGD,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;IAC7C,MAAM,YAAY,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC;IAEnD,aAAa,CAAC,aAAa,EAAE,CAAC;IAC9B,MAAM,eAAe,GAAG,aAAa,CAAC,eAAe,CAAC;IAEtD,MAAM,SAAS,GAAG,IAAA,2CAA2B,EAC5C,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,EAC/B,aAAa,EACb,MAAM,CACN,CAAC;IACF,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEzC,IAAI,UAAU,EAAE;QAGf,MAAM,IAAA,+BAAe,EAAC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;KAC/D;IAED,OAAO;QACN,OAAO,EAAE,SAAS;QAClB,UAAU,EAAE,eAAe;QAC3B,YAAY;KACZ,CAAC;AACH,CAAC;AA1CD,0DA0CC;AAWM,KAAK,UAAU,kBAAkB,CACvC,IAAe,EACf,MAAiB,EACjB,eAAgC,EAChC,SAAgC,EAChC,SAA8B;IAE9B,IAAI;QACH,OAAO,MAAM,IAAA,oBAAY,EACxB,IAAI,EACJ,MAAM,EACN,eAAe,EACf,SAAS,EACT,SAAS,CACT,CAAC;KACF;IAAC,OAAO,CAAC,EAAE;QACX,MAAM,IAAI,0BAAiB,CAAC,CAAC,CAAC,CAAC;KAC/B;AACF,CAAC;AAlBD,gDAkBC"}
|
package/dist/multibuild/utils.js
CHANGED
|
@@ -4,8 +4,8 @@ exports.getRegistryAndName = exports.generateBuildTasks = void 0;
|
|
|
4
4
|
const _ = require("lodash");
|
|
5
5
|
const tar = require("tar-stream");
|
|
6
6
|
function generateBuildTasks(images, buildMetadata) {
|
|
7
|
-
return
|
|
8
|
-
if (
|
|
7
|
+
return images.map((img) => {
|
|
8
|
+
if (typeof img.image === 'string') {
|
|
9
9
|
return {
|
|
10
10
|
external: true,
|
|
11
11
|
imageName: img.image,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/multibuild/utils.ts"],"names":[],"mappings":";;;AAgBA,4BAA4B;AAC5B,kCAAkC;AAclC,SAAgB,kBAAkB,CACjC,MAAyB,EACzB,aAA4B;IAE5B,OAAO,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/multibuild/utils.ts"],"names":[],"mappings":";;;AAgBA,4BAA4B;AAC5B,kCAAkC;AAclC,SAAgB,kBAAkB,CACjC,MAAyB,EACzB,aAA4B;IAE5B,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACzB,IAAI,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,EAAE;YAClC,OAAO;gBACN,QAAQ,EAAE,IAAI;gBACd,SAAS,EAAE,GAAG,CAAC,KAAK;gBACpB,WAAW,EAAE,GAAG,CAAC,WAAW;gBAC5B,QAAQ,EAAE,KAAK;gBACf,aAAa;aACb,CAAC;SACF;aAAM;YAEN,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI,EAAE;gBAC9B,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;aACnE;YACD,MAAM,EAKL,OAAO,EAEP,UAAU,EAAE,SAAS,EACrB,WAAW,EAAE,UAAU,EACvB,QAAQ,EAAE,OAAO,EACjB,MAAM,EACN,GAAG,UAAU,EACb,GAAG,GAAG,CAAC,KAAK,CAAC;YACd,OAAO,CAAC,CAAC,KAAK,CACb;gBACC,QAAQ,EAAE,KAAK;gBACf,WAAW,EAAE,GAAG,CAAC,WAAW;gBAC5B,WAAW,EAAE,GAAG,CAAC,IAAI,EAAE;gBACvB,QAAQ,EAAE,KAAK;gBACf,aAAa;aACb,EAED,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,IAAI;gBAC3B,CAAC,CAAC,EAAE,cAAc,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE;gBAC1C,CAAC,CAAC,EAAE,EAEL,UAAU,EAGV;gBACC,UAAU,EAAE;oBACX,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACnC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC/B,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC7B,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACrC;aACD,CAGD,CAAC;SACF;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AA5DD,gDA4DC;AAaD,SAAgB,kBAAkB,CAAC,KAAa;IAM/C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CACxB,4DAA4D,CAC5D,CAAC;IACF,IAAI,CAAC,KAAK,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,0BAA0B,KAAK,GAAG,CAAC,CAAC;KACpD;IACD,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC;IACnD,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;IACjD,MAAM,WAAW,GAAG,MAAM,EAAE,KAAK,CAChC,yEAAyE,CACzE,CAAC;IACF,IAAI,CAAC,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE;QAC3C,MAAM,IAAI,KAAK,CACd,4EAA4E,CAC5E,CAAC;KACF;IACD,OAAO;QACN,QAAQ;QACR,SAAS;QACT,OAAO;QACP,MAAM;KACN,CAAC;AACH,CAAC;AA5BD,gDA4BC"}
|
|
@@ -5,12 +5,12 @@ const t = require("io-ts");
|
|
|
5
5
|
const _ = require("lodash");
|
|
6
6
|
const stringRegex = /([^\s=]+?)=(.+)/;
|
|
7
7
|
const validate = (value) => {
|
|
8
|
-
if (
|
|
8
|
+
if (Array.isArray(value)) {
|
|
9
9
|
return validateStringArray(value);
|
|
10
10
|
}
|
|
11
|
-
else if (
|
|
11
|
+
else if (value != null && typeof value === 'object') {
|
|
12
12
|
return _.every(value, (v, k) => {
|
|
13
|
-
return
|
|
13
|
+
return typeof v === 'string' && typeof k === 'string';
|
|
14
14
|
});
|
|
15
15
|
}
|
|
16
16
|
return false;
|
|
@@ -19,7 +19,7 @@ const convert = (value) => {
|
|
|
19
19
|
if (!validate(value)) {
|
|
20
20
|
return;
|
|
21
21
|
}
|
|
22
|
-
if (
|
|
22
|
+
if (Array.isArray(value)) {
|
|
23
23
|
const varList = {};
|
|
24
24
|
_.each(value, (str) => {
|
|
25
25
|
const match = str.match(stringRegex);
|
|
@@ -44,7 +44,7 @@ exports.PermissiveVarList = new t.Type('VarList', validate, (u, ctx) => {
|
|
|
44
44
|
throw new Error('Encode not implemented for type VarList');
|
|
45
45
|
});
|
|
46
46
|
function validateStringArray(arr) {
|
|
47
|
-
if (!_.every(arr, (a) =>
|
|
47
|
+
if (!_.every(arr, (a) => typeof a === 'string')) {
|
|
48
48
|
return false;
|
|
49
49
|
}
|
|
50
50
|
return _.every(arr, (a) => stringRegex.test(a));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"varlist.js","sourceRoot":"","sources":["../../../lib/multibuild/validation-types/varlist.ts"],"names":[],"mappings":";;;AAiBA,2BAA2B;AAC3B,4BAA4B;AAQ5B,MAAM,WAAW,GAAG,iBAAiB,CAAC;AAEtC,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAoB,EAAE;IACrD,IAAI,
|
|
1
|
+
{"version":3,"file":"varlist.js","sourceRoot":"","sources":["../../../lib/multibuild/validation-types/varlist.ts"],"names":[],"mappings":";;;AAiBA,2BAA2B;AAC3B,4BAA4B;AAQ5B,MAAM,WAAW,GAAG,iBAAiB,CAAC;AAEtC,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAoB,EAAE;IACrD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACzB,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC;KAClC;SAAM,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACtD,OAAO,CAAC,CAAC,KAAK,CAAC,KAA4B,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACrD,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,QAAQ,CAAC;QACvD,CAAC,CAAC,CAAC;KACH;IACD,OAAO,KAAK,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,KAAc,EAAuB,EAAE;IACvD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACrB,OAAO;KACP;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACzB,MAAM,OAAO,GAAY,EAAE,CAAC;QAC5B,CAAC,CAAC,IAAI,CAAC,KAAiB,EAAE,CAAC,GAAG,EAAE,EAAE;YACjC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACrC,IAAI,KAAK,IAAI,IAAI,EAAE;gBAClB,OAAO;aACP;YACD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;KACf;SAAM;QACN,OAAO,KAAK,CAAC;KACb;AACF,CAAC,CAAC;AAEW,QAAA,iBAAiB,GAAG,IAAI,CAAC,CAAC,IAAI,CAC1C,SAAS,EACT,QAAQ,EACR,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;IACV,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,IAAI,KAAK,IAAI,IAAI,EAAE;QAClB,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KACxB;IACD,OAAO,CAAC,CAAC,OAAO,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;AAChD,CAAC,EACD,GAAG,EAAE;IACJ,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;AAC5D,CAAC,CACD,CAAC;AAEF,SAAS,mBAAmB,CAAC,GAAc;IAC1C,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,EAAE;QAChD,OAAO,KAAK,CAAC;KACb;IAID,OAAO,CAAC,CAAC,KAAK,CAAC,GAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7D,CAAC"}
|
package/dist/parse/compose.js
CHANGED
|
@@ -54,16 +54,17 @@ function normalize(inputCompositionObject, fileResolverCb) {
|
|
|
54
54
|
}
|
|
55
55
|
exports.normalize = normalize;
|
|
56
56
|
function normalizeObjectToComposition(inputCompositionObject) {
|
|
57
|
-
if (
|
|
57
|
+
if (inputCompositionObject == null &&
|
|
58
|
+
typeof inputCompositionObject !== 'object') {
|
|
58
59
|
throw new errors_1.ValidationError('Invalid composition format');
|
|
59
60
|
}
|
|
60
61
|
let version;
|
|
61
62
|
let c = inputCompositionObject;
|
|
62
|
-
if (
|
|
63
|
+
if (c.version == null) {
|
|
63
64
|
version = schemas_1.SchemaVersion.v1;
|
|
64
65
|
}
|
|
65
66
|
else {
|
|
66
|
-
if (
|
|
67
|
+
if (typeof c.version !== 'string') {
|
|
67
68
|
c.version = `${c.version}`;
|
|
68
69
|
}
|
|
69
70
|
switch (c.version) {
|
|
@@ -100,9 +101,9 @@ function normalizeObjectToComposition(inputCompositionObject) {
|
|
|
100
101
|
c.networks = _.mapValues(c.networks, normalizeNetwork);
|
|
101
102
|
}
|
|
102
103
|
const services = c.services || {};
|
|
103
|
-
const serviceNames =
|
|
104
|
-
const volumeNames =
|
|
105
|
-
const networkNames =
|
|
104
|
+
const serviceNames = Object.keys(services ?? {});
|
|
105
|
+
const volumeNames = Object.keys(c.volumes ?? {});
|
|
106
|
+
const networkNames = Object.keys(c.networks ?? {});
|
|
106
107
|
c.services = _(services)
|
|
107
108
|
.map((service, serviceName) => {
|
|
108
109
|
try {
|
|
@@ -123,10 +124,10 @@ function normalizeObjectToComposition(inputCompositionObject) {
|
|
|
123
124
|
return c;
|
|
124
125
|
}
|
|
125
126
|
function preflight(_version, data) {
|
|
126
|
-
if (
|
|
127
|
+
if (data.networks != null && typeof data.networks === 'object') {
|
|
127
128
|
data.networks = _.mapValues(data.networks, (n) => n || {});
|
|
128
129
|
}
|
|
129
|
-
if (
|
|
130
|
+
if (data.volumes != null && typeof data.volumes === 'object') {
|
|
130
131
|
data.volumes = _.mapValues(data.volumes, (v) => v || {});
|
|
131
132
|
}
|
|
132
133
|
}
|
|
@@ -138,9 +139,9 @@ function normalizeService(service, serviceNames, volumeNames, networkNames) {
|
|
|
138
139
|
service.build = normalizeServiceBuild(service.build, networkNames);
|
|
139
140
|
}
|
|
140
141
|
if (service.depends_on) {
|
|
141
|
-
if (!
|
|
142
|
+
if (!Array.isArray(service.depends_on)) {
|
|
142
143
|
service.depends_on = _.map(service.depends_on, (dep, serviceName) => {
|
|
143
|
-
if (
|
|
144
|
+
if (['service_started', 'service-started'].includes(dep.condition)) {
|
|
144
145
|
return serviceName;
|
|
145
146
|
}
|
|
146
147
|
throw new errors_1.ValidationError('Only "service_started" type of service dependency is supported');
|
|
@@ -150,7 +151,7 @@ function normalizeService(service, serviceNames, volumeNames, networkNames) {
|
|
|
150
151
|
throw new errors_1.ValidationError('Service dependencies must be unique');
|
|
151
152
|
}
|
|
152
153
|
_.forEach(service.depends_on, (dep) => {
|
|
153
|
-
if (!
|
|
154
|
+
if (!serviceNames.includes(dep)) {
|
|
154
155
|
throw new errors_1.ValidationError(`Unknown service dependency: ${dep}`);
|
|
155
156
|
}
|
|
156
157
|
});
|
|
@@ -162,7 +163,7 @@ function normalizeService(service, serviceNames, volumeNames, networkNames) {
|
|
|
162
163
|
service.env_file = normalizeAndValidateFilePath(service.env_file);
|
|
163
164
|
}
|
|
164
165
|
if (service.extra_hosts) {
|
|
165
|
-
if (!
|
|
166
|
+
if (!Array.isArray(service.extra_hosts)) {
|
|
166
167
|
service.extra_hosts = normalizeExtraHostObject(service.extra_hosts);
|
|
167
168
|
}
|
|
168
169
|
}
|
|
@@ -197,7 +198,7 @@ function normalizeService(service, serviceNames, volumeNames, networkNames) {
|
|
|
197
198
|
return service;
|
|
198
199
|
}
|
|
199
200
|
function normalizeArrayOfStrings(value) {
|
|
200
|
-
return
|
|
201
|
+
return value.map(String);
|
|
201
202
|
}
|
|
202
203
|
function normalizeServiceBuild(serviceBuild, networkNames) {
|
|
203
204
|
if (typeof serviceBuild === 'string') {
|
|
@@ -210,7 +211,7 @@ function normalizeServiceBuild(serviceBuild, networkNames) {
|
|
|
210
211
|
serviceBuild.labels = normalizeKeyValuePairs(serviceBuild.labels);
|
|
211
212
|
validateLabels(serviceBuild.labels);
|
|
212
213
|
}
|
|
213
|
-
if (serviceBuild.extra_hosts && !
|
|
214
|
+
if (serviceBuild.extra_hosts && !Array.isArray(serviceBuild.extra_hosts)) {
|
|
214
215
|
serviceBuild.extra_hosts = normalizeExtraHostObject(serviceBuild.extra_hosts);
|
|
215
216
|
}
|
|
216
217
|
if (serviceBuild.isolation) {
|
|
@@ -330,7 +331,7 @@ function validateServiceVolume(serviceVolume, volumeNames) {
|
|
|
330
331
|
}
|
|
331
332
|
}
|
|
332
333
|
function validateLabels(labels) {
|
|
333
|
-
|
|
334
|
+
Object.keys(labels ?? {}).forEach((name) => {
|
|
334
335
|
if (!/^[a-zA-Z0-9.-]+$/.test(name)) {
|
|
335
336
|
throw new errors_1.ValidationError(`Invalid label name: "${name}". ` +
|
|
336
337
|
'Label names must only contain alphanumeric ' +
|
|
@@ -381,7 +382,7 @@ function normalizeKeyValuePairs(obj, sep = '=') {
|
|
|
381
382
|
if (!obj) {
|
|
382
383
|
return {};
|
|
383
384
|
}
|
|
384
|
-
if (!
|
|
385
|
+
if (!Array.isArray(obj)) {
|
|
385
386
|
return _(obj)
|
|
386
387
|
.toPairs()
|
|
387
388
|
.map(([key, value]) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../lib/parse/compose.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../lib/parse/compose.ts"],"names":[],"mappings":"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"}
|
package/dist/resolve/index.js
CHANGED
|
@@ -76,10 +76,7 @@ async function resolveTarStreamOnEntry(header, stream, resolvers, pack, dockerfi
|
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
async function resolveTarStreamOnFinish(bundle, resolvers, pack, dockerfile, additionalTemplateVars) {
|
|
79
|
-
const satisfied = _(resolvers)
|
|
80
|
-
.filter((r) => r.isSatisfied(bundle))
|
|
81
|
-
.orderBy('priority', 'desc')
|
|
82
|
-
.value();
|
|
79
|
+
const satisfied = _.orderBy(resolvers.filter((r) => r.isSatisfied(bundle)), 'priority', 'desc');
|
|
83
80
|
if (satisfied.length === 0) {
|
|
84
81
|
pack.emit('error', new Error(dockerfile
|
|
85
82
|
? `Specified file not found or is invalid: ${dockerfile}`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/resolve/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/resolve/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,10 +18,9 @@ const versionCache = new BluebirdLRU({
|
|
|
18
18
|
})
|
|
19
19
|
.get('body')
|
|
20
20
|
.then((res) => {
|
|
21
|
-
const curr =
|
|
22
|
-
.map(
|
|
23
|
-
.filter(versionTest)
|
|
24
|
-
.value();
|
|
21
|
+
const curr = res.results
|
|
22
|
+
.map(({ name }) => name)
|
|
23
|
+
.filter(versionTest);
|
|
25
24
|
const tags = prev.concat(curr);
|
|
26
25
|
if (res.next != null) {
|
|
27
26
|
return get(tags, res.next);
|
|
@@ -44,7 +43,7 @@ class NodeResolver {
|
|
|
44
43
|
if (file.name === 'package.json') {
|
|
45
44
|
this.packageJsonContent = file.contents;
|
|
46
45
|
}
|
|
47
|
-
else if (file.name === 'wscript' ||
|
|
46
|
+
else if (file.name === 'wscript' || file.name.endsWith('.gyp')) {
|
|
48
47
|
this.hasScripts = true;
|
|
49
48
|
}
|
|
50
49
|
}
|
|
@@ -78,7 +77,7 @@ class NodeResolver {
|
|
|
78
77
|
if (nodeEngine == null) {
|
|
79
78
|
throw new Error('package.json: engines.node must be specified');
|
|
80
79
|
}
|
|
81
|
-
if (
|
|
80
|
+
if (typeof nodeEngine !== 'string') {
|
|
82
81
|
throw new Error('package.json: engines.node must be a string if present');
|
|
83
82
|
}
|
|
84
83
|
const range = nodeEngine;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodeResolver.js","sourceRoot":"","sources":["../../../lib/resolve/resolvers/nodeResolver.ts"],"names":[],"mappings":";;;AAgBA,qCAAqC;AAErC,4BAA4B;AAC5B,mCAAmC;AACnC,iCAAiC;AAEjC,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAEjD,kDAAkD;AAKlD,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;AAC3E,MAAM,YAAY,GAEd,IAAI,WAAW,CAAC;IACnB,MAAM,EAAE,IAAI,GAAG,IAAI;IACnB,OAAO,EAAE,CAAC,UAAkB,EAAE,EAAE;QAC/B,MAAM,GAAG,GAAG,CAAC,IAAc,EAAE,GAAW,EAAqB,EAAE;YAC9D,OAAO,OAAO,CAAC,OAAO,CACrB,QAAQ,CAAC;gBACR,GAAG;gBACH,IAAI,EAAE,IAAI;aACV,CAAC;iBACA,GAAG,CAAC,MAAM,CAAC;iBACX,IAAI,CAAC,CAAC,GAAwD,EAAE,EAAE;gBAElE,MAAM,IAAI,GAAa,
|
|
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": "3.0.
|
|
3
|
+
"version": "3.0.1",
|
|
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-
|
|
96
|
+
"publishedAt": "2023-07-07T16:19:08.941Z"
|
|
97
97
|
}
|
|
98
98
|
}
|