Add support for Ruby 2.4 in 1.4.0.

[discourse_docker.git] / image / discourse_bench / Dockerfile

diff --git a/image/discourse_bench/Dockerfile b/image/discourse_bench/Dockerfile
index 240f5d6ac827ea6b5bda8199e1bb0d9607a73e0f..97f0bf0c8105654c572fc6dcb29b87d765c322a8 100644 (file)
--- a/image/discourse_bench/Dockerfile
+++ b/image/discourse_bench/Dockerfile
@@ -1,4 +1,6 @@
-FROM samsaffron/discourse_test:latest
+# NAME:     discourse/discourse_bench
+# VERSION:  1.4.0
+FROM discourse/discourse_test:1.4.0
 
 MAINTAINER Gerhard Schlager <mail@gerhard-schlager.at>
 
@@ -17,11 +19,12 @@ RUN gem install facter &&\
 
 # reconfigure PostgreSQL template databases to use UTF-8
 # otherwise rake db:create fails
-RUN pg_dropcluster --stop 9.3 main &&\
-    pg_createcluster --start -e UTF-8 9.3 main
+RUN pg_dropcluster --stop 9.5 main &&\
+    pg_createcluster --start -e UTF-8 9.5 main
 
 # create role "discourse"
 RUN /etc/init.d/postgresql start &&\
+    sleep 5 &&\
     sudo -u postgres createuser --superuser discourse
 
 ADD run_bench.sh /tmp/run_bench.sh