Merge pull request #325 from phaldan/master

[discourse_docker.git] / image / discourse / Dockerfile

diff --git a/image/discourse/Dockerfile b/image/discourse/Dockerfile
index 3fc9716c0a5c33f7e37025224cfe068484dab616..898b6a9e99ec49e0a4d5a35c7c08af0365629ac3 100644 (file)
--- a/image/discourse/Dockerfile
+++ b/image/discourse/Dockerfile
@@ -1,21 +1,18 @@
-# Current version 1.0.3
-FROM samsaffron/discourse_base:1.0.3
+# NAME:     discourse/discourse
+# VERSION:  1.3.10
+FROM discourse/base:1.3.10
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
 # Discourse specific bits
 RUN useradd discourse -s /bin/bash -m -U &&\
-    mkdir /var/www && cd /var/www &&\
-     git clone https://github.com/discourse/discourse.git &&\
-     cd discourse &&\
-      git remote set-branches --add origin tests-passed &&\
+    mkdir -p /var/www &&\
+    cd /var/www &&\
+    git clone https://github.com/discourse/discourse.git &&\
+    cd discourse &&\
+    git remote set-branches --add origin tests-passed &&\
     chown -R discourse:discourse /var/www/discourse &&\
     cd /var/www/discourse &&\
-     sudo -u discourse RAILS4=1 bundle install --deployment \
+    sudo -u discourse bundle install --deployment \
          --without test --without development &&\
     find /var/www/discourse/vendor/bundle -name tmp -type d -exec rm -rf {} +
-
-
-# For a smaller but less flexible image:
-#RUN apt-get -y autoremove build-essential gcc gcc-4.7 .+-dev
-#RUN echo image size: $(du -hsx /)