Reorder commands and move docker commands to container push script

Author: Bhavik Kumar

.travis.yml

@@ -53,9 +53,8 @@ jobs:
     - export AWS_SECRET_ACCESS_KEY=$DEPLOYMENT_SECRET_ACCESS_KEY
     - unset AWS_SESSION_TOKEN
     script:
-    - if [ "TRAVIS_EVENT_TYPE" = "push" ]; then deployment/script/travis_deploy_ecr.sh; fi
     - ./gradlew check
-    - if [ "TRAVIS_EVENT_TYPE" = "push" ]; then ./gradlew docker dockerTag dockerTagsPush publish -PTAG=$TRAVIS_BUILD_NUMBER -PREPOSITORY_URI=$REPOSITORY_URI; fi
+    - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then deployment/script/travis_push_container.sh; fi
     - if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ]; then ./gradlew dockerPush; fi
     after_success:
     - ./gradlew sonarqube

deployment/script/travis_deploy_ecr.sh renamed to deployment/script/travis_push_container.sh

@@ -7,3 +7,4 @@ export REPOSITORY_URI=$(terraform output repository_url) || exit 1
 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