From 14f74c217e9f5c4b97d34c979d6a3ec5974eb635 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@fgsys.com>
Date: Fri, 8 Jan 2016 14:54:16 -0200
Subject: [PATCH] removed duplicated Dockerfile
---
.travis/docker.sh | 2 +-
Dockerfile | 33 ---------------------------------
HISTORY.md | 23 ++++++++++++++---------
3 files changed, 15 insertions(+), 43 deletions(-)
delete mode 100644 Dockerfile
diff --git a/.travis/docker.sh b/.travis/docker.sh
index 84eb7f7463d..1982a9ef008 100755
--- a/.travis/docker.sh
+++ b/.travis/docker.sh
@@ -7,7 +7,7 @@ CURL_URL="https://registry.hub.docker.com/u/rocketchat/rocket.chat/trigger/$PUSH
if [[ -v "$TRAVIS_TAG" ]]; then
CURL_DATA='{"source_type":"Tag","source_name":"'"$TRAVIS_TAG"'"}';
else
- CURL_DATA='{"docker_tag":"develop"}';
+ CURL_DATA='{"source_type":"Branch","source_name":"develop"}';
fi
curl -H "Content-Type: application/json" --data "$CURL_DATA" -X POST "$CURL_URL"
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index ed09ceb5bf8..00000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM node:0.10
-
-MAINTAINER buildmaster@rocket.chat
-
-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://rocket.chat/releases/latest/download -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/HISTORY.md b/HISTORY.md
index 625dae07616..a1e5feccfb9 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,7 +1,12 @@
-## v.NEXT
+## NEXT
+-
-## v0.12.0, 2016-Jan-04
+## 0.12.1, 2016-Jan-05
+
+- Fix problem with middleware that tries to parse json body
+
+## 0.12.0, 2016-Jan-04
- Settings: unset section if none is given on update
- Hide registration and forgot password links when hidding login form
@@ -19,7 +24,7 @@
- Try to parse all request bodies as JSON
- New password reset screen
-## v0.11.0, 2015-Dec-28
+## 0.11.0, 2015-Dec-28
- Add role bot to users of integrations in scope bot
- Add route to cadastre new integrations via API
@@ -62,15 +67,15 @@
- Turn channel and triggerWords optional in triggers
- Using branding image from main APP
-## v0.10.2, 2015-Dec-22
+## 0.10.2, 2015-Dec-22
- Fixes image preview bugs with filenames containing spaces
-## v0.10.1, 2015-Dec-21
+## 0.10.1, 2015-Dec-21
- Fix upload permissions introduced in raik:ufs 0.3.4
-## v0.10.0, 2015-Dec-21
+## 0.10.0, 2015-Dec-21
- Accept property *msg* as text in attachments
- Add "Room has been deleted" entry
@@ -170,7 +175,7 @@
- Use attachments to render preview of uploads and use relative paths
- Using flow-router group routes
-## v0.9.0, 2015-Dec-14
+## 0.9.0, 2015-Dec-14
- Fix broken image-link when og:image contains "&" (e.g. Google Maps)
- Error message when file upload media type it not accepted
@@ -212,7 +217,7 @@
- Fixed blockquote non-continous border
- Moved accountBox HTML to new separated template
-## v0.8.0, 2015-Dec-8
+## 0.8.0, 2015-Dec-8
- Fixed error: when allow change username was set to false, registration
- Improve message rendering removing MessageAction from render time
@@ -243,6 +248,6 @@
- Clear iOS app badge on app startup
- Fix for image swipebox to show in RTL interface
-## v0.1.0, 2015-May-19
+## 0.1.0, 2015-May-19
- Initial public launch
--
GitLab