Update standalone.yml

[discourse_docker.git] / image / discourse / Dockerfile

diff --git a/image/discourse/Dockerfile b/image/discourse/Dockerfile
index ba5043ba87c045423b36a1c2e903159fb36c4954..90eee727f62f724cb4f1fe6d1cc4ffa0d594d2d4 100644 (file)
--- a/image/discourse/Dockerfile
+++ b/image/discourse/Dockerfile
@@ -1,21 +1,19 @@
-# Current version 1.0.0
-FROM samsaffron/discourse_base:1.0.0
+# Current version 1.0.12
+FROM samsaffron/discourse_base:1.0.12
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
 # Discourse specific bits
 RUN useradd discourse -s /bin/bash -m -U &&\
-    mkdir /var/www && cd /var/www &&\
+    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 &&\
-     cd .. &&\
-     chown -R discourse:discourse /var/www/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 &&\
-    cd /var/www/discourse/vendor/bundle &&\
-       find . -name tmp -type d | xargs rm -rf
+    find /var/www/discourse/vendor/bundle -name tmp -type d -exec rm -rf {} +
 
 
 # For a smaller but less flexible image: