Sidekiq, redis, env var tweaks

Dockerfile

@@ -32,8 +32,9 @@ EXPOSE 8080
 
 ADD docker/rails/logstash-conf.sh /etc/logstash-conf.sh
 ADD docker/rails/runit_bootstrap.sh /run.sh
+ADD ./run_sidekiq.sh /run_sidekiq.sh
 
-RUN chmod +x /run.sh
+RUN chmod +x /run.sh /run_sidekiq.sh
 RUN bash -c "DB_ADAPTOR=nulldb bundle exec rake assets:precompile RAILS_ENV=production"
 
 CMD ["./run.sh"]

config/environments/production.rb

@@ -90,15 +90,15 @@
   config.logstasher.source = 'logstasher'
 
   config.action_mailer.default_url_options = {
-    host: ENV.fetch('SENDING_HOST'), protocol: 'https'
+    host: ENV['SENDING_HOST'], protocol: 'https'
   }
 
   config.action_mailer.smtp_settings = {
-    address: ENV.fetch('SMTP_HOSTNAME'),
-    port: ENV.fetch('SMTP_PORT'),
-    domain: ENV.fetch('SENDING_HOST'),
-    user_name: ENV.fetch('SMTP_USERNAME'),
-    password: ENV.fetch('SMTP_PASSWORD'),
+    address: ENV['SMTP_HOSTNAME'],
+    port: ENV['SMTP_PORT'],
+    domain: ENV['SENDING_HOST'],
+    user_name: ENV['SMTP_USERNAME'],
+    password: ENV['SMTP_PASSWORD'],
     authentication: :login,
     enable_starttls_auto: true
   }

config/initializers/sidekiq.rb

@@ -1,7 +1,17 @@
-Sidekiq.configure_server do |config|
-  config.redis = { url: 'redis://redis:6379' }
-end
+if Rails.env.production?
+  Sidekiq.configure_server do |config|
+    config.redis = { url: ENV['REDIS_URL'] }
+  end
+
+  Sidekiq.configure_client do |config|
+    config.redis = { url: ENV['REDIS_URL'] }
+  end
+else
+  Sidekiq.configure_server do |config|
+    config.redis = { url: 'redis://redis:6379' }
+  end
 
-Sidekiq.configure_client do |config|
-  config.redis = { url: 'redis://redis:6379' }
+  Sidekiq.configure_client do |config|
+    config.redis = { url: 'redis://redis:6379' }
+  end
 end

run_sidekiq.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+export RAILS_ENV=production
+bundle exec sidekiq -c 5 -v -e production