Update standalone.yml

[discourse_docker.git] / image / discourse / Dockerfile

diff --git a/image/discourse/Dockerfile b/image/discourse/Dockerfile
index ef9d855d0e0706282b4aa1ab8458386477a411ff..90eee727f62f724cb4f1fe6d1cc4ffa0d594d2d4 100644 (file)
--- a/image/discourse/Dockerfile
+++ b/image/discourse/Dockerfile
@@ -1,37 +1,21 @@
-# Current version 0.2.5
-FROM samsaffron/discourse_base:0.2.3
+# 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 && cd / &&\
-      wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
-      tar -xjf phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
-      rm phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
-      cp phantomjs-1.9.7-linux-x86_64/bin/phantomjs /bin/phantomjs &&\
-      rm -fr phantomjs-1.9.7-linux-x86_64
+    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 /)
-
-# RUN cd /var/www/discourse && bundle exec rake db:test:prepare && bundle exec rspec
-
-# mkdir -p /src/godeb && cd /src/godeb && curl -O https://godeb.s3.amazonaws.com/godeb-amd64.tar.gz &&\
-# cd /src/godeb && tar -xzvf godeb-amd64.tar.gz &&\
-# cd /src/godeb && ./godeb install &&\
-# cd /src &&  git clone https://github.com/coreos/etcd.git &&\
-# cd /src/etcd && ./build &&\
-# cp /src/etcd/etcd /usr/local/bin &&\
-# add-apt-repository ppa:chris-lea/node.js &&\