From da74f43c04aae4743f14431ef1864b56bc53ee66 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sun, 12 Feb 2017 13:02:37 -0200
Subject: [PATCH] Adding chmod to Dockerfiles

---
 .docker/develop/Dockerfile      |  7 ++++---
 .docker/experimental/Dockerfile | 32 --------------------------------
 .docker/latest/Dockerfile       |  7 ++++---
 3 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 .docker/experimental/Dockerfile

diff --git a/.docker/develop/Dockerfile b/.docker/develop/Dockerfile
index 2dfe5acc639..a2f45f97b03 100644
--- a/.docker/develop/Dockerfile
+++ b/.docker/develop/Dockerfile
@@ -4,8 +4,6 @@ ENV RC_VERSION develop
 
 MAINTAINER buildmaster@rocket.chat
 
-VOLUME /app/uploads
-
 RUN set -x \
  && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/download" -o rocket.chat.tgz \
  && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
@@ -14,10 +12,13 @@ RUN set -x \
  && rm rocket.chat.tgz rocket.chat.tgz.asc \
  && cd /app/bundle/programs/server \
  && npm install \
- && npm cache clear
+ && npm cache clear \
+ && chown rocketchat:rocketchat /app -R
 
 USER rocketchat
 
+VOLUME /app/uploads
+
 WORKDIR /app/bundle
 
 # needs a mongoinstance - defaults to container linking with alias 'mongo'
diff --git a/.docker/experimental/Dockerfile b/.docker/experimental/Dockerfile
deleted file mode 100644
index 85da2793efc..00000000000
--- a/.docker/experimental/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM rocketchat/base:4
-
-ENV RC_VERSION experimental
-
-MAINTAINER buildmaster@rocket.chat
-
-VOLUME /app/uploads
-
-RUN set -x \
- && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/download" -o rocket.chat.tgz \
- && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
- && gpg --verify rocket.chat.tgz.asc \
- && tar -zxf rocket.chat.tgz -C /app \
- && rm rocket.chat.tgz rocket.chat.tgz.asc \
- && cd /app/bundle/programs/server \
- && npm install \
- && npm cache clear
-
-USER rocketchat
-
-WORKDIR /app/bundle
-
-# needs a mongoinstance - defaults to container linking with alias 'mongo'
-ENV MONGO_URL=mongodb://mongo:27017/rocketchat \
-    HOME=/tmp \
-    PORT=3000 \
-    ROOT_URL=http://localhost:3000 \
-    Accounts_AvatarStorePath=/app/uploads
-
-EXPOSE 3000
-
-CMD ["node", "main.js"]
diff --git a/.docker/latest/Dockerfile b/.docker/latest/Dockerfile
index 48127d127de..eac0369d9af 100644
--- a/.docker/latest/Dockerfile
+++ b/.docker/latest/Dockerfile
@@ -4,8 +4,6 @@ ENV RC_VERSION latest
 
 MAINTAINER buildmaster@rocket.chat
 
-VOLUME /app/uploads
-
 RUN set -x \
  && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/download" -o rocket.chat.tgz \
  && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
@@ -14,10 +12,13 @@ RUN set -x \
  && rm rocket.chat.tgz rocket.chat.tgz.asc \
  && cd /app/bundle/programs/server \
  && npm install \
- && npm cache clear
+ && npm cache clear \
+ && chown rocketchat:rocketchat /app -R
 
 USER rocketchat
 
+VOLUME /app/uploads
+
 WORKDIR /app/bundle
 
 # needs a mongoinstance - defaults to container linking with alias 'mongo'