# HG changeset patch
# User Chris Cannam
# Date 1501788018 -3600
# Node ID 8edb54e29f00ef0b9c9e6bef190ce12c485a59eb
# Parent  2b1b8ebb7d98e85abc4b2c3bde11482f45efb18d
Minor tweaks

diff -r 2b1b8ebb7d98 -r 8edb54e29f00 extra/soundsoftware/dockertest/Dockerfile
--- a/extra/soundsoftware/dockertest/Dockerfile	Thu Aug 03 17:24:49 2017 +0100
+++ b/extra/soundsoftware/dockertest/Dockerfile	Thu Aug 03 20:20:18 2017 +0100
@@ -1,8 +1,8 @@
 
 # For documentation and experimental purposes only. As a
 # reconstruction of the machine image that runs this application,
-# there are lots of things missing here; meanwhile as a good Docker
-# configuration, it fails in mixing together rather a lot of concerns.
+# there are lots of things missing here; but as a good Docker
+# configuration, it fails by mixing together rather a lot of concerns.
 
 FROM ubuntu:16.04
 MAINTAINER Chris Cannam <cannam@all-day-breakfast.com>
@@ -32,13 +32,17 @@
     libio-socket-ssl-perl \
     logrotate \
     mercurial \
-    openjdk-9-jdk-headless \
     postgresql \
     rsync \
     ruby \
     ruby-dev \
     sudo
 
+# Also used on the live site, for javadoc extraction, but this is
+# would be by far the biggest package here: let's omit it while we're
+# not making use of it
+#   openjdk-9-jdk-headless
+
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 
@@ -66,15 +70,19 @@
 # Set up database config etc (todo: insert variables)
 
 RUN cp extra/soundsoftware/dockertest/database.yml config/database.yml
-RUN bundle exec rake generate_secret_token
 
 
-# Install Rails dependencies (database.yml must be populated before this)
+# Install Rails and dependencies (database.yml must be populated before this)
 
 RUN gem install bundler
 RUN bundle install
 
 
+# Initialise Redmine token (bundler must be installed before this)
+
+RUN bundle exec rake generate_secret_token
+
+
 # Import Postgres database from postgres-dumpall file
 
 RUN chown postgres postgres-dumpall