From acf4f857900b6da9f35c3a9c14e8f758db5d9944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Wed, 27 May 2015 20:14:59 +0200 Subject: [PATCH 1/3] Make `uploads` a Docker volume --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 71ce7d5f9..18aa000f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,3 +10,5 @@ RUN groupadd -r node \ USER node EXPOSE 5000 + +VOLUME [ "/usr/src/app/uploads" ] From a9fb9cd79da520c0e7a4985507edd4cafe6869e6 Mon Sep 17 00:00:00 2001 From: Teemu Date: Tue, 2 Jun 2015 21:02:48 +0300 Subject: [PATCH 2/3] Scroll down after own message --- media/js/views/room.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/media/js/views/room.js b/media/js/views/room.js index 741b26a51..788274578 100644 --- a/media/js/views/room.js +++ b/media/js/views/room.js @@ -267,6 +267,8 @@ text: $textarea.val() }); $textarea.val(''); + this.scrollLocked = true; + this.scrollMessages(); }, addMessage: function(message) { // Smells like pasta From 79a9f249e9f7f3fa38ecf98e232c8fe8fb198d6b Mon Sep 17 00:00:00 2001 From: pulser Date: Wed, 27 May 2015 20:12:08 +0100 Subject: [PATCH 3/3] Enable XMPP in docker-compose.yml --- Dockerfile | 1 + docker-compose.yml | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5d07550ff..9fe5ddb53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,5 +11,6 @@ RUN groupadd -r node \ USER node EXPOSE 5000 +EXPOSE 5222 VOLUME [ "/usr/src/app/uploads" ] diff --git a/docker-compose.yml b/docker-compose.yml index eb196550b..a2a72b2b0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,10 +8,13 @@ app: build: . links: - db - environment: - - LCB_DATABASE_URI=mongodb://db/letschat ports: - 5000:5000 + - 5222:5222 + environment: + - LCB_DATABASE_URI=mongodb://db/letschat + - LCB_XMPP_ENABLE=true + - LCB_XMPP_PORT=5222 # Mongo Database db: