@hybridless/hybridless 0.1.0-beta3 → 0.1.0-beta4
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/options.json
CHANGED
|
@@ -15675,6 +15675,9 @@
|
|
|
15675
15675
|
"from": {
|
|
15676
15676
|
"type": "string"
|
|
15677
15677
|
},
|
|
15678
|
+
"path": {
|
|
15679
|
+
"type": "string"
|
|
15680
|
+
},
|
|
15678
15681
|
"to": {
|
|
15679
15682
|
"type": "string"
|
|
15680
15683
|
}
|
|
@@ -15718,6 +15721,9 @@
|
|
|
15718
15721
|
"from": {
|
|
15719
15722
|
"type": "string"
|
|
15720
15723
|
},
|
|
15724
|
+
"path": {
|
|
15725
|
+
"type": "string"
|
|
15726
|
+
},
|
|
15721
15727
|
"to": {
|
|
15722
15728
|
"type": "string"
|
|
15723
15729
|
}
|
package/package.json
CHANGED
|
@@ -33,12 +33,13 @@ class FunctionContainerBaseEvent extends FunctionBaseEvent_1.FunctionBaseEvent {
|
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
35
35
|
const files = this.getContainerFiles();
|
|
36
|
+
const dockerFile = files.find((f) => f.dest == 'Dockerfile');
|
|
36
37
|
this.image = new Image_1.Image(this.plugin, {
|
|
37
|
-
dockerFile:
|
|
38
|
+
dockerFile: dockerFile.name,
|
|
38
39
|
additionalDockerFiles: files.filter((f) => f.dest != 'Dockerfile')
|
|
39
|
-
.map((f) => ({ from: f.name, to: f.dest })),
|
|
40
|
+
.map((f) => ({ from: f.name, to: f.dest, path: f.dir })),
|
|
40
41
|
dockerBuildArgs: this.getContainerBuildArgs()
|
|
41
|
-
}, this.getImageName());
|
|
42
|
+
}, this.getImageName(), dockerFile.dir);
|
|
42
43
|
}
|
|
43
44
|
return BPromise.resolve();
|
|
44
45
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FunctionContainerBaseEvent.js","sourceRoot":"","sources":["../../src/resources/BaseEvents/FunctionContainerBaseEvent.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAwD;AAIxD,2CAAiH;AAEjH,qCAAsC;AACtC,6BAA8B;AAC9B,uCAAwC;AAExC,oCAAiC;AAEjC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAE5C,MAAa,0BAA2B,SAAQ,qCAA8C;IAM5F,YAAmB,MAAkB,EAAE,IAAc,EAAE,KAAkC,EAAE,KAAa,EAAE,sBAAgC;;QACxI,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAClC,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QACrD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;QAClC,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAA,MAAkC,IAAI,CAAC,KAAM,0CAAE,OAAO,CAAA,CAAC;IACrF,CAAC;IAGY,MAAM;;;YAEjB,IAAI,IAAI,CAAC,kBAAkB,EAAE;gBAC3B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAkC,IAAI,CAAC,KAAM,0CAAE,OAAO,CAAC,CAAA;aAE9F;iBAAM;gBACL,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;gBACtC,
|
|
1
|
+
{"version":3,"file":"FunctionContainerBaseEvent.js","sourceRoot":"","sources":["../../src/resources/BaseEvents/FunctionContainerBaseEvent.ts"],"names":[],"mappings":"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"}
|
package/resources/Image.js
CHANGED
|
@@ -15,11 +15,12 @@ const child = require("child_process");
|
|
|
15
15
|
const BPromise = require("bluebird");
|
|
16
16
|
const executor = util.promisify(child.exec);
|
|
17
17
|
class Image {
|
|
18
|
-
constructor(plugin, imageOptions, imageName) {
|
|
18
|
+
constructor(plugin, imageOptions, imageName, dockerFilePath) {
|
|
19
19
|
this.plugin = plugin;
|
|
20
20
|
this.imageOptions = imageOptions;
|
|
21
21
|
this.imageName = imageName;
|
|
22
22
|
this.currentTag = Date.now() + '';
|
|
23
|
+
this.dockerFilePath = dockerFilePath;
|
|
23
24
|
}
|
|
24
25
|
set options(options) {
|
|
25
26
|
this.imageOptions = options;
|
|
@@ -99,10 +100,10 @@ class Image {
|
|
|
99
100
|
const customDockerFile = this.imageOptions.dockerFile;
|
|
100
101
|
const serverlessDir = this.plugin.serverless.config.servicePath;
|
|
101
102
|
const additionalDockerFiles = (this.imageOptions.additionalDockerFiles || []).map((file) => {
|
|
102
|
-
return { name: file.from, dir: serverlessDir, dest: file.to };
|
|
103
|
+
return { name: file.from, dir: file.path || serverlessDir, dest: file.to };
|
|
103
104
|
});
|
|
104
105
|
return [
|
|
105
|
-
{ name: customDockerFile, dir: serverlessDir, dest: 'Dockerfile' },
|
|
106
|
+
{ name: customDockerFile, dir: this.dockerFilePath || serverlessDir, dest: 'Dockerfile' },
|
|
106
107
|
...additionalDockerFiles
|
|
107
108
|
];
|
|
108
109
|
}
|
package/resources/Image.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../src/resources/Image.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,6BAA8B;AAC9B,uCAAwC;AAaxC,qCAAsC;AAGtC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAE5C,MAAa,KAAK;
|
|
1
|
+
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../src/resources/Image.ts"],"names":[],"mappings":"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"}
|