Merge pull request #69 from bnc-projects/jan-updates

Fix docker push when building master

Author: Bhavik Kumar

.travis.yml

@@ -55,7 +55,6 @@ jobs:
     script:
     - ./gradlew check
     - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash deployment/script/travis_push_container.sh; fi
-    - if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ]; then ./gradlew dockerPush; fi
     after_success:
     - ./gradlew sonarqube
   - stage: deploy to development

deployment/script/travis_push_container.sh

@@ -8,3 +8,8 @@ cd $TRAVIS_BUILD_DIR
 eval $(aws sts assume-role --role-arn "$OPERATIONS_ROLE_ARN" --role-session-name "${TRAVIS_REPO_SLUG//\//-}" | jq -r '.Credentials | @sh "export AWS_SESSION_TOKEN=\(.SessionToken)\nexport AWS_ACCESS_KEY_ID=\(.AccessKeyId)\nexport AWS_SECRET_ACCESS_KEY=\(.SecretAccessKey) "') || exit 1
 $(aws ecr get-login --no-include-email --region $AWS_DEFAULT_REGION) || exit 1
 ./gradlew docker dockerTag dockerTagsPush publish -PTAG=$TRAVIS_BUILD_NUMBER -PREPOSITORY_URI=$REPOSITORY_URI || exit 1
+
+# Only tag latest when we are building master
+if [ "$TRAVIS_BRANCH" == "master" ]; then
+  ./gradlew dockerPush -PTAG=$TRAVIS_BUILD_NUMBER -PREPOSITORY_URI=$REPOSITORY_URI || exit 1
+fi