From 1b24efa29fa877260e52a221fece5fc2b036e0aa Mon Sep 17 00:00:00 2001
From: Joshua Fernandes <joshua.fernandes@consensys.net>
Date: Tue, 26 Nov 2019 13:01:06 +1000
Subject: [PATCH] fix for docker login acr (#218)

Signed-off-by: Joshua Fernandes <joshua.fernandes@consensys.net>
---
 .circleci/config.yml | 4 ++--
 build.gradle         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 21d3dfcae2..bc98216277 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -183,8 +183,8 @@ jobs:
       - run:
           name: Publish Docker
           command: |
-            docker login --username "${DOCKER_USER}" -password "${DOCKER_PASSWORD}"
-            docker login "${ACR_REPO}" -username "${ACR_DOCKER_USER}" -password "${ACR_DOCKER_PASSWORD}"
+            docker login --username "${DOCKER_USER}" --password "${DOCKER_PASSWORD}"
+            docker login "${ACR_REPO}" --username "${ACR_DOCKER_USER}" --password "${ACR_DOCKER_PASSWORD}"
             ./gradlew --no-daemon --parallel "-Pbranch=${CIRCLE_BRANCH}" dockerUpload
 
 workflows:
diff --git a/build.gradle b/build.gradle
index 024fa37ea6..21b34ca021 100644
--- a/build.gradle
+++ b/build.gradle
@@ -577,7 +577,7 @@ task dockerUpload(type: Exec) {
     additionalTags.add('develop')
   }
 
-  if (!version ==~ /.*-SNAPSHOT/) {
+  if (! version ==~ /.*-SNAPSHOT/) {
     additionalTags.add('latest')
     additionalTags.add(version.split(/\./)[0..1].join('.'))
   }