Merge branch 'master' of github.com:pfaffman/discourse_docker

[discourse_docker.git] / image / discourse_dev / Dockerfile

diff --git a/image/discourse_dev/Dockerfile b/image/discourse_dev/Dockerfile
index 6659669c83e88e80bf536c17a7d95bb051341000..8e106da1023d23b31bbb49eb9fdcd447a61cfd8f 100644 (file)
--- a/image/discourse_dev/Dockerfile
+++ b/image/discourse_dev/Dockerfile
@@ -1,21 +1,18 @@
-FROM samsaffron/discourse_fast_switch:1.0.13
+# NAME:     discourse/discourse_dev
+# VERSION:  release
+FROM discourse/base:release
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
-RUN use_22
-RUN rm -fr /usr/local/include/ruby-2.0.0
+# Install for mailcatcher gem
+RUN apt-get update && apt-get install -y libsqlite3-dev \
+    && gem install mailcatcher && rm -rf /var/lib/apt/lists/*
 
-RUN chown -R discourse:discourse /usr/ruby_22
-
-RUN rm /var/www/discourse/.bundle/config
-
-RUN cd /var/www/discourse && git pull && sudo -u discourse bundle install
-RUN use_22
-
-# CLEANUP
-RUN rm -fr /var/www/discourse/vendor/bundle/ruby
-RUN rm -fr /usr/ruby_20
+# Remove the code added on base image
+RUN rm -rf /var/www/*
 
+# Give discourse user no-passwd sudo permissions (for bundle install)
+ADD sudoers.discourse /etc/sudoers.d/discourse
 
 # get redis going
 ADD redis.template.yml /pups/redis.yml
@@ -30,10 +27,13 @@ ENV LC_ALL en_US.UTF-8
 ADD postgres.template.yml /pups/postgres.yml
 RUN LANG=en_US.UTF-8 /pups/bin/pups /pups/postgres.yml
 
-# move pg out of the way
-RUN mv /shared/postgres_data /shared/postgres_data_orig
+# add dev databases
+ADD postgres_dev.template.yml /pups/postgres_dev.yml
+RUN /pups/bin/pups /pups/postgres_dev.yml
 
-# We got gems ... we need no source in the image ...
-RUN rm -fr /var/www/discourse
+# move default postgres_data out of the way
+RUN mv /shared/postgres_data /shared/postgres_data_orig
 
+# re-instantiate data on boot if needed (this will allow it to persist across
+# invocations when used with a mounted volume)
 ADD ensure-database /etc/runit/1.d/ensure-database