change build artifact names to remove branch reference

.docker/dockerfiles/develop/Dockerfile

-FROM node:0.10
-
-MAINTAINER buildmaster@rocket.chat
-
-RUN apt-get update \
-&&  apt-get install -y graphicsmagick \
-&&  rm -rf /var/lib/apt/lists/*
-
-RUN groupadd -r rocketchat \
-&&  useradd -r -g rocketchat rocketchat \
-&&  mkdir /app  \
-&&  mkdir /app/uploads
-
-# gpg: key 4FD08014: public key "Rocket.Chat Buildmaster <buildmaster@rocket.chat>" imported
-RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104
-
-WORKDIR /app
-
-RUN curl -fSL "https://s3.amazonaws.com/rocketchatbuild/rocket.chat-develop.tgz" -o rocket.chat.tgz \
-&&  tar zxvf ./rocket.chat.tgz \
-&&  rm ./rocket.chat.tgz  \
-&&  cd /app/bundle/programs/server \
-&&  npm install
-
-USER rocketchat
-
-VOLUME /app/uploads
-WORKDIR /app/bundle
-
-# needs a mongoinstance - defaults to container linking with alias 'mongo'
-ENV MONGO_URL=mongodb://mongo:27017/rocketchat \
-    PORT=3000 \
-    ROOT_URL=http://localhost:3000 \
-    Accounts_AvatarStorePath=/app/uploads
-
-EXPOSE 3000
-CMD ["node", "main.js"]

.docker/dockerfiles/master/Dockerfile

-FROM node:0.10
-
-MAINTAINER buildmaster@rocket.chat
-
-RUN apt-get update \
-&&  apt-get install -y graphicsmagick \
-&&  rm -rf /var/lib/apt/lists/*
-
-RUN groupadd -r rocketchat \
-&&  useradd -r -g rocketchat rocketchat \
-&&  mkdir /app  \
-&&  mkdir /app/uploads
-
-# gpg: key 4FD08014: public key "Rocket.Chat Buildmaster <buildmaster@rocket.chat>" imported
-RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104
-
-WORKDIR /app
-
-RUN curl -fSL "https://s3.amazonaws.com/rocketchatbuild/rocket.chat-master.tgz" -o rocket.chat.tgz \
-&&  tar zxvf ./rocket.chat.tgz \
-&&  rm ./rocket.chat.tgz  \
-&&  cd /app/bundle/programs/server \
-&&  npm install
-
-USER rocketchat
-
-VOLUME /app/uploads
-WORKDIR /app/bundle
-
-# needs a mongoinstance - defaults to container linking with alias 'mongo'
-ENV MONGO_URL=mongodb://mongo:27017/rocketchat \
-    PORT=3000 \
-    ROOT_URL=http://localhost:3000 \
-    Accounts_AvatarStorePath=/app/uploads
-
-EXPOSE 3000
-CMD ["node", "main.js"]

.travis.yml

@@ -22,7 +22,6 @@ before_script:
 script:
 - meteor build /tmp/build
 before_deploy:
-- source ".travis/setbranch.sh"
 - source ".travis/setdeploydir.sh"
 - ".travis/setupsig.sh"
 - ".travis/namefiles.sh"
@@ -32,9 +31,9 @@ deploy:
   api_key:
     secure: SLtbGv9vL6qC3rKGwKuXfUSFuRCeLsBFiRA1nBDWoyua7F3rLy8fBvhS3sXRDCqAF6hJgXQwZzX2pS1Lljwjjmwi/80Ns7VDtreX5QstHukFAxaJh2E0Lz5zQdSqAb61KdAipZmYfp2fgCr8T+xztE/mvtPD5R8CcIQIjJpl9rh+mrkkshkcaNOY4JQrqyrcTeCOeBQMXTZSkkbdJr4gb9++A2c61K0txfid9+VwqGm5MwvaT80JC5wLQkL8rS9OUcNJHFf90ELFZpRZnZnI2lsfmTBAxRKL994UZgzru3XNMhUTsJPh7OyVn/xSlyjLcvsn4dSon1PE9t3RkuxsbTxx/XY+gIkXSGl38jZlhextaJoV0gTFkEg33tF/aZ4+I+iZM8LYfRAoUuZU0fSzGnFtFZp4xptF2ECLKmI/3dmuE6iwr+G1xUer9g2Rq9fXXrHgUA164544IdY4aDisxd9U78U0K7WaPtbvphiVl4GbgVnfTEgNVdpXcQxUtcXPZMiBRz5+E+1fExmCfO6+7mZ/yzDrsFYoRdmuo1SMGRI4iqb5jl/PImZ9ukTqRmQdqd3WJp3zzPbIEJPwhMtS5LMxzBMSfugXwjEajkXybcH5CWQ7jo+ogNqcM/CcJ3q4ahYuLTN7VeZWZ8h5kwr9bPxPooZuhWw0WPRa+XUM22o=
   file:
-  - "$ROCKET_DEPLOY_DIR/rocket.chat-$ROCKET_BRANCH.tgz"
-  - "$ROCKET_DEPLOY_DIR/rocket.chat-$ROCKET_BRANCH.tgz.asc"
-  - "$ROCKET_DEPLOY_DIR/rocket.chat-$ROCKET_BRANCH.spk"
+  - "$ROCKET_DEPLOY_DIR/rocket.chat.tgz"
+  - "$ROCKET_DEPLOY_DIR/rocket.chat.tgz.asc"
+  - "$ROCKET_DEPLOY_DIR/rocket.chat.spk"
   on:
     tags: true
     all_branches: true

.travis/docker.sh

@@ -4,15 +4,7 @@ IFS=$'\n\t'
 
 CURL_URL="https://registry.hub.docker.com/u/rocketchat/rocket.chat/trigger/$PUSHTOKEN/"
 
-if ["$TRAVIS_TAG" ]; then
-  CURL_DATA='{"source_type":"Tag","source_name":"'"$TRAVIS_TAG"'","docker_tag":"'"$TRAVIS_TAG"'"}';
-else
-  if [ "$TRAVIS_BRANCH" == "master" ]; then
-    CURL_DATA='{"source_type":"Branch","source_name":"master","docker_tag":"latest"}';
-  else
-    CURL_DATA='{"source_type":"Branch","source_name":"'"$TRAVIS_BRANCH"'","docker_tag":"'"$TRAVIS_BRANCH"'"}';
-  fi
-fi
+CURL_DATA='{"source_type":"Tag","source_name":"'"$TRAVIS_TAG"'"}';
 
 curl -H "Content-Type: application/json" --data "$CURL_DATA" -X POST "$CURL_URL"
-echo -H "Content-Type: application/json" --data "$CURL_DATA" -X POST "CURL_URL"
+

.travis/namefiles.sh

@@ -4,6 +4,6 @@ IFS=$'\n\t'
 
 #cd $TRAVIS_BUILD_DIR
 #export TAG=$(git describe --abbrev=0 --tags)
-cp /tmp/build/Rocket.Chat.tar.gz "$ROCKET_DEPLOY_DIR/rocket.chat-$ROCKET_BRANCH.tgz"
-gpg --armor --detach-sign "$ROCKET_DEPLOY_DIR/rocket.chat-$ROCKET_BRANCH.tgz"
+cp /tmp/build/Rocket.Chat.tar.gz "$ROCKET_DEPLOY_DIR/rocket.chat.tgz"
+gpg --armor --detach-sign "$ROCKET_DEPLOY_DIR/rocket.chat.tgz"
 ls -l $ROCKET_DEPLOY_DIR

.travis/sandstorm.sh

@@ -35,4 +35,4 @@ sed -i "s/\sid = .*/$SANDSTORM_ID/" sandstorm-pkgdef.capnp
 mkdir -p /home/vagrant/bundle/opt/app/.sandstorm/
 cp /opt/app/.sandstorm/launcher.sh /home/vagrant/bundle/opt/app/.sandstorm/
 sed -i "s/\spgp/#pgp/g" sandstorm-pkgdef.capnp
-spk pack $ROCKET_DEPLOY_DIR/rocket.chat-$ROCKET_BRANCH.spk
+spk pack $ROCKET_DEPLOY_DIR/rocket.chat.spk

.travis/setbranch.sh

-export ROCKET_BRANCH="master"
-echo $ROCKET_BRANCH
-