From 54aaead278b8087c5f1d1234af18905e88cf369f Mon Sep 17 00:00:00 2001
From: "S. Li" <sli@makawave.com>
Date: Mon, 4 Jan 2016 19:38:33 -0500
Subject: [PATCH] change build artifact names to remove branch reference

---
 .docker/dockerfiles/develop/Dockerfile | 37 --------------------------
 .docker/dockerfiles/master/Dockerfile  | 37 --------------------------
 .travis/docker.sh                      | 12 ++-------
 .travis/namefiles.sh                   |  4 +--
 .travis/sandstorm.sh                   |  2 +-
 .travis/setbranch.sh                   |  3 ---
 6 files changed, 5 insertions(+), 90 deletions(-)
 delete mode 100644 .docker/dockerfiles/develop/Dockerfile
 delete mode 100644 .docker/dockerfiles/master/Dockerfile
 delete mode 100755 .travis/setbranch.sh

diff --git a/.docker/dockerfiles/develop/Dockerfile b/.docker/dockerfiles/develop/Dockerfile
deleted file mode 100644
index cbb9a7bfe12..00000000000
--- a/.docker/dockerfiles/develop/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-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"]
diff --git a/.docker/dockerfiles/master/Dockerfile b/.docker/dockerfiles/master/Dockerfile
deleted file mode 100644
index dd62d8cc71e..00000000000
--- a/.docker/dockerfiles/master/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-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"]
diff --git a/.travis/docker.sh b/.travis/docker.sh
index 255601ef0f5..f3955d255a9 100755
--- a/.travis/docker.sh
+++ b/.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"
+
diff --git a/.travis/namefiles.sh b/.travis/namefiles.sh
index 18d2dc26da6..f71334fb7f2 100755
--- a/.travis/namefiles.sh
+++ b/.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
diff --git a/.travis/sandstorm.sh b/.travis/sandstorm.sh
index 4c74593ac06..9ec3b97b0e6 100755
--- a/.travis/sandstorm.sh
+++ b/.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
diff --git a/.travis/setbranch.sh b/.travis/setbranch.sh
deleted file mode 100755
index cb6a3d7c7a0..00000000000
--- a/.travis/setbranch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export ROCKET_BRANCH="master"
-echo $ROCKET_BRANCH
-