Merge branch 'internal' of https://github.com/srcclr/commit-watcher into srcclr_updates

Author: newbishme

Dockerfile-internal

@@ -12,5 +12,4 @@ RUN mkdir /myapp
 ADD . /myapp
 WORKDIR /myapp
 
-RUN bundle exec sidekiq &
 ENTRYPOINT scripts/deploy

config/environments/production.rb

@@ -22,7 +22,7 @@
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

config/environments/test.rb

@@ -13,7 +13,7 @@
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
+  config.public_file_server.enabled = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

scripts/deploy

@@ -4,4 +4,5 @@ bundle exec rake assets:precompile --trace
 
 export SECRET_KEY_BASE=$(rake secret)
 
+bundle exec sidekiq &
 bundle exec rails server -b 0.0.0.0