From 832031a02adae50d6ffdbee92855c6ab63e5d8aa Mon Sep 17 00:00:00 2001
From: Phil Kunz <github@philkunz.com>
Date: Sun, 5 Jun 2016 23:59:10 +0200
Subject: [PATCH] fix registry login scope

---
 ts/npmci.prepare.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ts/npmci.prepare.ts b/ts/npmci.prepare.ts
index 06f9766..017faa1 100644
--- a/ts/npmci.prepare.ts
+++ b/ts/npmci.prepare.ts
@@ -29,6 +29,7 @@ let docker = function(){
         plugins.beautylog.error("You have to specify Login Data to the Docker Registry");
         process.exit(1);
     }
+    plugins.shelljs.exec("docker login -u gitlab-ci-token -p " + ciBuildToken + " " + "registry.gitlab.com"); // Always also login to GitLab Registry
     let dockerRegexResultArray = dockerRegex.exec(process.env.NPMCI_LOGIN_DOCKER);
     let username = dockerRegexResultArray[1];
     let password = dockerRegexResultArray[2];
@@ -41,7 +42,7 @@ let dockerGitlab = function(){
     let done = plugins.q.defer();
     env.dockerRegistry = "registry.gitlab.com";
     let ciBuildToken = process.env.CI_BUILD_TOKEN
-    plugins.shelljs.exec("docker login -u gitlab-ci-token -p " + ciBuildToken + " " + env.dockerRegistry);
+    plugins.shelljs.exec("docker login -u gitlab-ci-token -p " + ciBuildToken + " " + "registry.gitlab.com");
     done.resolve();
     return done.promise;
 }
@@ -51,8 +52,7 @@ export let prepare = function(serviceArg:string){
         case "npm":
             return npm();
         case "docker":
-            return docker()
-                .then(dockerGitlab); // always also login to gitlab registry for tests 
+            return docker();
         case "docker-gitlab":
             return dockerGitlab()
         default: