only deploy from master on tags

.travis.yml

@@ -4,7 +4,6 @@ branches:
   only:
   - develop
   - master
-  - even-faster-deploy
 node_js:
 - '0.12'
 cache:
@@ -33,14 +32,15 @@ deploy:
     on:
       branch:
       - develop
-      - master
-      - even-faster-deploy
-  - provider: releases
-    api_key: "GITHUB OAUTH TOKEN"
-    file: "FILE TO UPLOAD"
+  - provider: s3
+    access_key_id: "AKIAIKIA7H7D47KUHYCA"
+    secret_access_key: $ACCESSKEY
+    bucket: "rocketchatbuild"
     skip_cleanup: true
+    local_dir: /tmp/deploy
     on:
-      branch: master
       tags: true
+      branch:
+      - master
 after_deploy:
 - .travis/docker.sh

.travis/docker.sh

@@ -13,9 +13,9 @@ CURL_URL="https://registry.hub.docker.com/u/rocketchat/rocket.chat/trigger/$PUSH
 
 if [ -z ${TRAVIS_TAG+x} ];
 then
-CURL_DATA='{"source_type": "Branch", "source_name": "'$TRAVIS_BRANCH'", "docker_tag": "'$TAG.$TRAVIS_BUILD_NUMBER.$TRAVIS_BRANCH'"}';
+CURL_DATA='{"source_type": "Branch", "source_name": "'$TRAVIS_BRANCH'", "docker_tag": "'$TRAVIS_BUILD_NUMBER.$TRAVIS_BRANCH'"}';
 else
-CURL_DATA='{"source_type": "Tag", "source_name": "'$TAG'", "docker_tag": "'$TAG.$TRAVIS_BUILD_NUMBER.$TRAVIS_BRANCH'"}';
+CURL_DATA='{"source_type": "Tag", "source_name": "'$TRAVIS_TAG'", "docker_tag": "'$TRAVIS_BUILD_NUMBER.$TRAVIS_BRANCH.$TRAVIS_TAG'"}';
 fi
 
 curl -H "${CURL_HEADER}" --data "${CURL_DATA}" -X POST "${CURL_URL}"