@hybridless/hybridless 0.1.39-alpha.5 → 0.1.39-alpha.6
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/core/Docker.js +5 -2
- package/core/Docker.js.map +1 -1
- package/package.json +1 -1
- package/resources/Image.js +4 -6
- package/resources/Image.js.map +1 -1
package/core/Docker.js
CHANGED
|
@@ -36,9 +36,12 @@ class Docker {
|
|
|
36
36
|
response.on('error', (err) => reject(err));
|
|
37
37
|
response.on('end', () => {
|
|
38
38
|
const resp = Buffer.concat(chunks).toString('utf8');
|
|
39
|
-
|
|
39
|
+
const regex = /"ID":"sha256:([a-fA-F0-9]{64})"/;
|
|
40
|
+
const match = resp.match(regex);
|
|
41
|
+
const id = match === null || match === void 0 ? void 0 : match[1];
|
|
42
|
+
if (resp.includes('Successfully built') && id) {
|
|
40
43
|
this.plugin.logger.info('Docker image built!');
|
|
41
|
-
resolve(
|
|
44
|
+
resolve(id);
|
|
42
45
|
}
|
|
43
46
|
else {
|
|
44
47
|
this.plugin.logger.info('Docker image build error!');
|
package/core/Docker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Docker.js","sourceRoot":"","sources":["../src/core/Docker.ts"],"names":[],"mappings":";;;;;;;;;;;AAIA,uCAAwC;AACxC,qCAAsC;AACtC,gCAAiC;AAEjC,MAAqB,MAAM;IAIzB,YAAY,MAAkB;QAC5B,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IACO,UAAU;QAChB,OAAO,IAAI,SAAS,CAAC;YACnB,UAAU,EAAE,sBAAsB;SACnC,CAAC,CAAC;IACL,CAAC;IAEY,UAAU,CAAC,KAAkB,EAAE,SAAiB,EAAE,IAAgC;;YAC7F,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,OAAO,IAAI,QAAQ,CAAC,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC5C,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,SAAS,GAAG,CAAC,CAAC;gBAClE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;gBAC9C,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,kBAC9B,CAAC,EAAE,SAAS,IACT,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GACnC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;oBACnB,IAAI,GAAG;wBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;yBAChB,IAAI,QAAQ,EAAE;wBACjB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;wBACjD,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;wBAC3C,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;4BACtB,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Docker.js","sourceRoot":"","sources":["../src/core/Docker.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/resources/Image.js
CHANGED
|
@@ -62,7 +62,7 @@ class Image {
|
|
|
62
62
|
const localImageName = this._getECRRepoName();
|
|
63
63
|
const ECRRepoURL = (yield this._getFullECRRepoImageURL());
|
|
64
64
|
const files = this.getContainerFiles();
|
|
65
|
-
yield this.plugin.docker.buildImage(files, `${localImageName}:${this.currentTag}`, this.getContainerBuildArgs());
|
|
65
|
+
this.dockerImageId = yield this.plugin.docker.buildImage(files, `${localImageName}:${this.currentTag}`, this.getContainerBuildArgs());
|
|
66
66
|
const tagResp = yield this._runCommand(`docker tag ${localImageName}:${this.currentTag} ${ECRRepoURL}`, '');
|
|
67
67
|
if (tagResp.stderr)
|
|
68
68
|
reject(tagResp.stderr);
|
|
@@ -137,11 +137,10 @@ class Image {
|
|
|
137
137
|
_getECRRepoName() {
|
|
138
138
|
return `${this.plugin.getName()}/${this.imageName}-${this.plugin.stage}.v3`.toLowerCase();
|
|
139
139
|
}
|
|
140
|
-
_getFullECRRepoImageURL(
|
|
140
|
+
_getFullECRRepoImageURL() {
|
|
141
141
|
return __awaiter(this, void 0, void 0, function* () {
|
|
142
142
|
const accID = yield this.plugin.getAccountID();
|
|
143
|
-
|
|
144
|
-
return `${accID}.dkr.ecr.${this.plugin.region}.amazonaws.com` + `/${this._getECRRepoName()}${tag}`;
|
|
143
|
+
return `${accID}.dkr.ecr.${this.plugin.region}.amazonaws.com` + `/${this._getECRRepoName()}:${this.currentTag}`;
|
|
145
144
|
});
|
|
146
145
|
}
|
|
147
146
|
_runCommand(command, params, allowFailure) {
|
|
@@ -232,8 +231,7 @@ class Image {
|
|
|
232
231
|
_cleanupLocalImages(ECRRepoName) {
|
|
233
232
|
return __awaiter(this, void 0, void 0, function* () {
|
|
234
233
|
this.plugin.logger.info(`Cleaning up local docker images from: ${ECRRepoName}..`);
|
|
235
|
-
|
|
236
|
-
return yield this.plugin.docker.deleteImage(`${localImageName}`);
|
|
234
|
+
return yield this.plugin.docker.deleteImage(this.dockerImageId);
|
|
237
235
|
});
|
|
238
236
|
}
|
|
239
237
|
}
|
package/resources/Image.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../src/resources/Image.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,6BAA8B;AAC9B,uCAAwC;AAGxC,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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"}
|