@hybridless/hybridless 0.1.30 → 0.1.31
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/package.json +1 -1
- package/resources/Image.js +7 -1
- package/resources/Image.js.map +1 -1
package/package.json
CHANGED
package/resources/Image.js
CHANGED
|
@@ -66,6 +66,12 @@ class Image {
|
|
|
66
66
|
const tagResp = yield this._runCommand(`docker tag ${localImageName}:${this.currentTag} ${ECRRepoURL}`, '');
|
|
67
67
|
if (tagResp.stderr)
|
|
68
68
|
reject(tagResp.stderr);
|
|
69
|
+
if (this.options.additionalTag) {
|
|
70
|
+
const newRepoURL = ECRRepoURL.replace(this.currentTag, this.options.additionalTag);
|
|
71
|
+
const addTagResp = yield this._runCommand(`docker tag ${localImageName}:${this.currentTag} ${newRepoURL}`, '');
|
|
72
|
+
if (addTagResp.stderr)
|
|
73
|
+
reject(addTagResp.stderr);
|
|
74
|
+
}
|
|
69
75
|
resolve();
|
|
70
76
|
}));
|
|
71
77
|
});
|
|
@@ -88,7 +94,7 @@ class Image {
|
|
|
88
94
|
if (this.options.additionalTag) {
|
|
89
95
|
this.plugin.logger.info(`Pushing docker image to additional tag (${this.options.additionalTag}).`);
|
|
90
96
|
const newRepoURL = ECRRepoURL.replace(this.currentTag, this.options.additionalTag);
|
|
91
|
-
const addPushResp = yield this._runCommand(`docker push ${
|
|
97
|
+
const addPushResp = yield this._runCommand(`docker push ${newRepoURL}`, '');
|
|
92
98
|
if (addPushResp && addPushResp.stderr && addPushResp.stderr.toLowerCase().indexOf('error'))
|
|
93
99
|
return reject(addPushResp.stderr);
|
|
94
100
|
}
|
package/resources/Image.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../src/resources/Image.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../src/resources/Image.ts"],"names":[],"mappings":"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"}
|