Docker: fixes and updates for latest version

Author: Thomas McNiven

Dockerfile

@@ -15,6 +15,7 @@ COPY . /opt/hummingbird/server
 
 ENV DATABASE_URL=postgresql://postgres:mysecretpassword@postgres/
 ENV REDIS_URL=redis://redis/1
+ENV ELASTICSEARCH_HOST=elasticsearch
 
 ENTRYPOINT ["bundle", "exec"]
 CMD ["puma", "--port=80"]

Gemfile.lock

@@ -367,7 +367,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    spring (1.4.0)
+    spring (1.7.1)
     sprockets (3.3.4)
       rack (~> 1.0)
     sprockets-rails (2.3.3)
@@ -454,4 +454,4 @@ DEPENDENCIES
   typhoeus
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

bin/rails

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
 end
 APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'

bin/rake

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
 end
 require_relative '../config/boot'
 require 'rake'

bin/spring

@@ -4,12 +4,12 @@
 # It gets overwritten when you run the `spring binstub` command.
 
 unless defined?(Spring)
-  require "rubygems"
-  require "bundler"
+  require 'rubygems'
+  require 'bundler'
 
   if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m))
-    Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
-    gem "spring", match[1]
-    require "spring/binstub"
+    Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq.join(Gem.path_separator) }
+    gem 'spring', match[1]
+    require 'spring/binstub'
   end
 end

config/chewy.yml

@@ -1,8 +1,14 @@
-test:
-  prefix: 'test'
+default: &default
+  host: <%= ENV['ELASTICSEARCH_HOST'] %>
 
 development:
+  <<: *default
   prefix: 'development'
 
+test:
+  <<: *default
+  prefix: 'test'
+
 production:
+  <<: *default
   prefix: 'production'