Merge remote-tracking branch 'origin/master' into exercise-anomaly-detection

# Conflicts:
#	Capfile
#	Gemfile.lock
#	db/schema.rb

config/deploy.rb

@@ -17,7 +17,7 @@ namespace :deploy do
   after :compile_assets, :copy_vendor_assets do
     on roles(fetch(:assets_roles)) do
       within release_path do
-        execute :cp, 'vendor/assets/images/*', 'public/assets/'
+        execute :cp, '-r', 'vendor/assets/images/', 'public/assets/'
         execute :cp, '-r', 'vendor/assets/javascripts/ace', 'public/assets/'
       end
     end

config/docker.yml.erb.example

@@ -34,7 +34,21 @@ production:
   ws_host: ws://localhost:4243 #url to connect rails server to docker host
   ws_client_protocol: wss:// #set the websocket protocol to be used by the client to connect to the rails server (ws on development, wss on production)
 
+staging:
+  <<: *default
+  host: unix:///var/run/docker.sock
+  pool:
+    active: true
+    refill:
+      async: false
+      batch_size: 8
+      interval: 15
+      timeout: 60
+  workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %>
+  ws_host: ws://localhost:4243 #url to connect rails server to docker host
+  ws_client_protocol: 'wss:' #set the websocket protocol to be used by the client to connect to the rails server (ws on development, wss on production)
+
 test:
   <<: *default
-  host: tcp://192.168.59.104:2376
+  host: tcp://127.0.0.1:2376
   workspace_root: <%= File.join('/', 'shared', Rails.env) %>

config/docker.yml.erb.travis

@@ -32,7 +32,7 @@ production:
       timeout: 60
   workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %>
   ws_host: ws://localhost:4243 #url to connect rails server to docker host
-  ws_client_protocol: 'wss:' #set the websocket protocol to be used by the client to connect to the rails server (ws on development, wss on production)
+  ws_client_protocol: wss:// #set the websocket protocol to be used by the client to connect to the rails server (ws on development, wss on production)
 
 staging:
   <<: *default
@@ -50,5 +50,5 @@ staging:
 
 test:
   <<: *default
-  host: tcp://192.168.59.104:2376
+  host: tcp://127.0.0.1:2376
   workspace_root: <%= File.join('/', 'shared', Rails.env) %>

config/environments/development.rb

@@ -35,6 +35,9 @@ Rails.application.configure do
   # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
+  # Suppress logger output for asset requests.
+  config.assets.quiet = true
+
   # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.
   # Raises helpful error messages.