From 0bbd4aadc7ffdd5043a9139ae0ed95066dcd408b Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Thu, 5 Jul 2018 14:23:23 -0700 Subject: [PATCH] We don't need tags when building. --- .travis/deploy.sh | 2 +- build.sh | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis/deploy.sh b/.travis/deploy.sh index 4a4a659..2e13759 100644 --- a/.travis/deploy.sh +++ b/.travis/deploy.sh @@ -12,7 +12,7 @@ deploy() { docker tag maxking/mailman-web "$URL/maxking/mailman-web:$TAG" docker tag maxking/postorius "$URL/maxking/postorius:$TAG" # Login to the registry and push. - docker login -u $USER -p ${!PASSWORD} $URL + docker login -u "$USER" -p "${PASSWORD}" "$URL" docker push "$URL/maxking/mailman-web:$TAG" docker push "$URL/maxking/mailman-core:$TAG" docker push "$URL/maxking/postorius:$TAG" diff --git a/build.sh b/build.sh index 1d37d54..eb8b1e4 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,6 @@ if [ "$1" = "dev" ]; then fi REG_URL=${REGISTRY}_URL -: "${TAG:=0.1}" if [ "$EVENT_TYPE" = "cron" ] || [ "$DEV" = "true" ]; then python3 -m venv venv @@ -58,7 +57,7 @@ if [ "$EVENT_TYPE" = "cron" ] || [ "$DEV" = "true" ]; then -t maxking/postorius:rolling postorius/ else # Do the normal building process. - $DOCKER build -t maxking/mailman-core:$TAG core/ - $DOCKER build -t maxking/mailman-web:$TAG web/ - $DOCKER build -t maxking/postorius:$TAG postorius/ + $DOCKER build -t maxking/mailman-core core/ + $DOCKER build -t maxking/mailman-web web/ + $DOCKER build -t maxking/postorius postorius/ fi