Move delayed_job into supervisord

It was too difficult to coordinate the database setup task.

Author: abevoelker

Dockerfile

@@ -35,7 +35,8 @@ RUN chown -R openproject:openproject /etc/nginx/sites-available &&\
     ln -s ../sites-available/openproject.conf
 
 # Add supervisord configs
-ADD supervisord/rails.conf /etc/supervisor/conf.d/
-ADD supervisord/nginx.conf /etc/supervisor/conf.d/
+ADD supervisord/rails.conf       /etc/supervisor/conf.d/
+ADD supervisord/nginx.conf       /etc/supervisor/conf.d/
+ADD supervisord/delayed_job.conf /etc/supervisor/conf.d/
 
-CMD ["/var/www/openproject/docker/scripts/run_rails.sh"]
+CMD ["/var/www/openproject/docker/scripts/start_application.sh"]

Vagrantfile

@@ -34,18 +34,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     openproject.vm.provider 'docker' do |d|
       d.image = 'abevoelker/openproject'
       d.name  = 'openproject'
-      d.cmd   = ['/var/www/openproject/docker/scripts/run_rails.sh']
-
-      d.link('openproject_postgres:postgres')
-      d.link('openproject_memcached:memcached')
-    end
-  end
-
-  config.vm.define "openproject_delayed_job" do |openproject|
-    openproject.vm.provider 'docker' do |d|
-      d.image = 'abevoelker/openproject'
-      d.name  = 'openproject_delayed_job'
-      d.cmd   = ['/var/www/openproject/docker/scripts/run_background_job.sh']
+      d.cmd   = ['/var/www/openproject/docker/scripts/start_application.sh']
 
       d.link('openproject_postgres:postgres')
       d.link('openproject_memcached:memcached')

scripts/run_background_job.sh

@@ -7,5 +7,5 @@ if [ ! -f /var/www/openproject/.setup-complete ]; then
   echo -e "\nSetup complete!\n"
 fi
 
-echo -e "\nBooting Rails application..."
+echo -e "\nBooting application..."
 /usr/bin/supervisord -c /etc/supervisor/supervisord.conf -n

scripts/run_rails.sh renamed to scripts/start_application.sh

@@ -0,0 +1,5 @@
+[program:rails]
+user=openproject
+directory=/var/www/openproject
+command=/var/www/openproject/docker/scripts/env.sh bundle exec script/delayed_job run --exit-on-complete
+autorestart=true

supervisord/delayed_job.conf

@@ -2,5 +2,4 @@
 user=openproject
 directory=/var/www/openproject
 command=/var/www/openproject/docker/scripts/env.sh bundle exec puma -b unix:///var/www/openproject/tmp/puma.sock
-redirect_stderr=true
 autorestart=true