From 9bb6dbc493a4c8c1ae7338ec28b6e56d873e88b2 Mon Sep 17 00:00:00 2001
From: Gareth Dunstone <freedom.2.the.leetle.people@gmail.com>
Date: Mon, 6 Jul 2020 14:45:50 +1000
Subject: [PATCH] trying to remove self-dependency

---
 .gitlab-ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6134acf..ceecb86 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,11 +24,12 @@ variables:
         export CI_APPLICATION_REPOSITORY=${CI_APPLICATION_REPOSITORY:-$CI_REGISTRY_IMAGE}
         export CI_APPLICATION_TAG=${CI_APPLICATION_TAG:-$CI_COMMIT_TAG}
       fi
-    - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY  
+    # - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
 
 build:buildx-master:
-  image: docker:dind
   extends: .build
+  image: docker:dind
   only: 
     refs:
       - master
@@ -43,8 +44,8 @@ build:buildx-master:
     - docker buildx build --platform $CI_BUILDX_ARCHS --progress plain --pull -t "$CI_REGISTRY_IMAGE" --push .
 
 build:buildx:
-  image: docker:dind
   extends: .build
+  image: docker:dind
   only:
     variables:
       - $CI_BUILDX_ARCHS