From 3bd31937cc3857adb1e7fa204f57385904f96e81 Mon Sep 17 00:00:00 2001 From: Tom Staubitz Date: Sat, 12 Dec 2015 00:46:52 +0800 Subject: [PATCH] Added websocket protocols to docker config --- config/docker.yml.erb | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/config/docker.yml.erb b/config/docker.yml.erb index 5ac309e8..1124e063 100644 --- a/config/docker.yml.erb +++ b/config/docker.yml.erb @@ -1,3 +1,4 @@ +#Why erb? default: &default connection_timeout: 3 pool: @@ -7,9 +8,17 @@ default: &default development: <<: *default host: tcp://192.168.59.104:2376 - ws_host: ws://192.168.59.104:2376 - #workspace_root: <%= File.join('/', 'shared', Rails.env) %> + ws_host: ws://192.168.59.104:2376 #url to connect rails server to docker host + ws_client_protocol: ws:// #set the websocket protocol to be used by the client to connect to the rails server (ws on development, wss on production) workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %> + pool: + active: true + refill: + async: false + batch_size: 8 + interval: 15 + timeout: 60 + #workspace_root: <%= File.join('/', 'shared', Rails.env) %> production: <<: *default @@ -22,7 +31,8 @@ production: interval: 15 timeout: 60 workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %> - ws_host: ws://localhost:4243 + 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