fix for docker login acr (#218)

Signed-off-by: Joshua Fernandes <joshua.fernandes@consensys.net>
pull/221/head
Joshua Fernandes 5 years ago committed by GitHub
parent 9562c71db2
commit 1b24efa29f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      .circleci/config.yml
  2. 2
      build.gradle

@ -183,8 +183,8 @@ jobs:
- run: - run:
name: Publish Docker name: Publish Docker
command: | command: |
docker login --username "${DOCKER_USER}" -password "${DOCKER_PASSWORD}" docker login --username "${DOCKER_USER}" --password "${DOCKER_PASSWORD}"
docker login "${ACR_REPO}" -username "${ACR_DOCKER_USER}" -password "${ACR_DOCKER_PASSWORD}" docker login "${ACR_REPO}" --username "${ACR_DOCKER_USER}" --password "${ACR_DOCKER_PASSWORD}"
./gradlew --no-daemon --parallel "-Pbranch=${CIRCLE_BRANCH}" dockerUpload ./gradlew --no-daemon --parallel "-Pbranch=${CIRCLE_BRANCH}" dockerUpload
workflows: workflows:

@ -577,7 +577,7 @@ task dockerUpload(type: Exec) {
additionalTags.add('develop') additionalTags.add('develop')
} }
if (!version ==~ /.*-SNAPSHOT/) { if (! version ==~ /.*-SNAPSHOT/) {
additionalTags.add('latest') additionalTags.add('latest')
additionalTags.add(version.split(/\./)[0..1].join('.')) additionalTags.add(version.split(/\./)[0..1].join('.'))
} }

Loading…
Cancel
Save