build with branch name

.travis.yml

@@ -33,7 +33,7 @@ script:
 - cd .travis
 - sh ./namefiles.sh
 - cd ..
-- meteor add  rocketchat:livechat rocketchat:hubot 
+- meteor add  rocketchat:livechat rocketchat:hubot
 - meteor build --server demo.rocket.chat  ../build
 - cd .travis
 - sh ./namedemo.sh

.travis/namedemo.sh

 cd ../../build
 FILENAME=demo.rocket.chat-`cat version.txt`.tgz
-mv Rocket.Chat.tar.gz  $FILENAME
-ln -s  $FILENAME demo.rocket.chat-v.latest.tgz
+mv Rocket.Chat.tar.gz  "$FILENAME"
+ln -s  "$FILENAME" demo.rocket.chat-v.latest.tgz
 

.travis/namefiles.sh

 cd ../../build
 FILENAME=rocket.chat-`cat version.txt`.tgz
-mv Rocket.Chat.tar.gz  $FILENAME
-ln -s  $FILENAME rocket.chat-v.latest.tgz
+mv Rocket.Chat.tar.gz  "$FILENAME"
+ln -s  "$FILENAME" "$TRAVIS_BRANCH.rocket.chat-v.latest.tgz"
 

.travis/setbuildinfo.js

@@ -8,11 +8,17 @@ var lr = new LineByLineReader(BUILD_INFO_PATH);
 
 var firstline = "";
 
+
 if (process.env.TRAVIS_BUILD_NUMBER)  {
 	var transformVersion = function (firstline) {
 		var versions = firstline.split(".");
+		var verstring = versions[0] + '.' + versions[1] + '.' + process.env.TRAVIS_BUILD_NUMBER + '-'  + process.env.TRAVIS_BRANCH + '\n';
+		if (process.env.TRAVIS_TAG) {
+			verstring = TRAVIS_TAG + '-' + process.env.TRAVIS_BRANCH  + '\n';
+
+		}
 
-		return versions[0] + '.' + versions[1] + '.' + process.env.TRAVIS_BUILD_NUMBER + '\n';
+		return verstring;
 	};
 
 

Dockerfile

@@ -16,7 +16,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EB
 
 WORKDIR /app
 
-RUN curl -fSL "https://s3.amazonaws.com/rocketchatbuild/rocket.chat-v.latest.tgz" -o rocket.chat.tgz \
+RUN curl -fSL "https://s3.amazonaws.com/rocketchatbuild/develop.rocket.chat-v.latest.tgz" -o rocket.chat.tgz \
 &&  tar zxvf ./rocket.chat.tgz \
 &&  rm ./rocket.chat.tgz  \
 &&  cd /app/bundle/programs/server \