From ac41feba8159d86519be4831228cea4f3dcf0e89 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 8 Mar 2019 16:37:27 -0500 Subject: [PATCH] only log into docker when password available --- appveyor.yml | 1 - build-ci.sh | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b39530a0ef..228e8df576 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,6 @@ stack: node 10 install: - sh: npm i -g gulp -- sh: echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - cmd: choco install cloc --no-progress - cmd: "cloc --include-lang C#,SQL,Razor,\"Bourne Shell\",PowerShell,HTML,CSS,Sass,JavaScript,TypeScript --vcs git" diff --git a/build-ci.sh b/build-ci.sh index d07d770ea0..e0c0b1ccc2 100644 --- a/build-ci.sh +++ b/build-ci.sh @@ -15,10 +15,14 @@ fi echo "Prod deploy: ${PROD_DEPLOY}" echo "Tag name: ${TAG_NAME}" -chmod +x ./build.sh - #dotnet build --configuration Debug +if [ "${DOCKER_USERNAME}" != "" -a "${DOCKER_PASSWORD}" != "" ] +then + echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin +fi + +chmod +x ./build.sh ./build.sh ./build.sh tag dev