diff --git a/dist/mod_docker/mod.builddocker.js b/dist/mod_docker/mod.builddocker.js index a397352..0a082cd 100644 --- a/dist/mod_docker/mod.builddocker.js +++ b/dist/mod_docker/mod.builddocker.js @@ -155,7 +155,7 @@ class Dockerfile { this.buildTag = this.cleanTag; this.gitlabTestTag = exports.dockerTag('registry.gitlab.com', this.repo, this.version, 'test'); this.gitlabReleaseTag = exports.dockerTag('registry.gitlab.com', this.repo, this.version); - this.releaseTag = exports.dockerTag(NpmciEnv.dockerRegistry, this.repo, this.version); + this.releaseTag = exports.dockerTag('docker.io', this.repo, this.version); this.containerName = 'dockerfile-' + this.version; if (options.filePath && options.read) { this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath)); @@ -180,16 +180,16 @@ class Dockerfile { */ push(stageArg) { return __awaiter(this, void 0, void 0, function* () { + yield npmci_bash_1.bash(`docker tag ${this.buildTag} ${this.releaseTag}`); + yield npmci_bash_1.bash(`docker tag ${this.buildTag} ${this.gitlabReleaseTag}`); + yield npmci_bash_1.bash(`docker tag ${this.buildTag} ${this.gitlabTestTag}`); switch (stageArg) { case 'release': - yield npmci_bash_1.bash(`docker tag ${this.buildTag} ${this.releaseTag}`); - yield npmci_bash_1.bash(`docker push ${this.releaseTag}`); - yield npmci_bash_1.bash(`docker tag ${this.buildTag} ${this.gitlabReleaseTag}`); yield npmci_bash_1.bash(`docker push ${this.gitlabReleaseTag}`); + yield npmci_bash_1.bash(`docker push ${this.releaseTag}`); break; case 'test': default: - yield npmci_bash_1.bash(`docker tag ${this.buildTag} ${this.gitlabTestTag}`); yield npmci_bash_1.bash(`docker push ${this.gitlabTestTag}`); break; } @@ -200,9 +200,8 @@ class Dockerfile { */ pull(registryArg) { return __awaiter(this, void 0, void 0, function* () { - let pullTag = this.gitlabTestTag; - yield npmci_bash_1.bash('docker pull ' + pullTag); - yield npmci_bash_1.bash('docker tag ' + pullTag + ' ' + this.buildTag); + yield npmci_bash_1.bash(`docker pull ${this.gitlabTestTag}`); + yield npmci_bash_1.bash(`docker tag ${this.gitlabTestTag} ${this.buildTag}`); }); } /** @@ -287,4 +286,4 @@ exports.cleanTagsArrayFunction = function (dockerfileArrayArg, trackingArrayArg) }); return cleanTagsArray; }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mod.builddocker.js","sourceRoot":"","sources":["../../ts/mod_docker/mod.builddocker.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mod.builddocker.js","sourceRoot":"","sources":["../../ts/mod_docker/mod.builddocker.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/ts/mod_docker/mod.builddocker.ts b/ts/mod_docker/mod.builddocker.ts index ae929e8..1bbc3a9 100644 --- a/ts/mod_docker/mod.builddocker.ts +++ b/ts/mod_docker/mod.builddocker.ts @@ -169,7 +169,7 @@ export class Dockerfile { this.buildTag = this.cleanTag this.gitlabTestTag = dockerTag('registry.gitlab.com', this.repo, this.version, 'test') this.gitlabReleaseTag = dockerTag('registry.gitlab.com', this.repo, this.version) - this.releaseTag = dockerTag(NpmciEnv.dockerRegistry, this.repo, this.version) + this.releaseTag = dockerTag('docker.io', this.repo, this.version) this.containerName = 'dockerfile-' + this.version if (options.filePath && options.read) { this.content = plugins.smartfile.fs.toStringSync(plugins.path.resolve(options.filePath)) @@ -193,16 +193,16 @@ export class Dockerfile { * pushes the Dockerfile to a registry */ async push (stageArg) { + await bash(`docker tag ${this.buildTag} ${this.releaseTag}`) + await bash(`docker tag ${this.buildTag} ${this.gitlabReleaseTag}`) + await bash(`docker tag ${this.buildTag} ${this.gitlabTestTag}`) switch (stageArg) { case 'release': - await bash(`docker tag ${this.buildTag} ${this.releaseTag}`) - await bash(`docker push ${this.releaseTag}`) - await bash(`docker tag ${this.buildTag} ${this.gitlabReleaseTag}`) await bash(`docker push ${this.gitlabReleaseTag}`) + await bash(`docker push ${this.releaseTag}`) break case 'test': default: - await bash(`docker tag ${this.buildTag} ${this.gitlabTestTag}`) await bash(`docker push ${this.gitlabTestTag}`) break } @@ -212,9 +212,8 @@ export class Dockerfile { * pulls the Dockerfile from a registry */ async pull (registryArg: string) { - let pullTag = this.gitlabTestTag - await bash('docker pull ' + pullTag) - await bash('docker tag ' + pullTag + ' ' + this.buildTag) + await bash(`docker pull ${this.gitlabTestTag}`) + await bash(`docker tag ${this.gitlabTestTag} ${this.buildTag}`) } /**