From 821bbb277444df3ef5f44846756c39a923c02d54 Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Thu, 22 Feb 2018 17:16:43 +0100 Subject: [PATCH] Add staging info to docker.yml.erb Signed-off-by: Sebastian Serth --- config/docker.yml.erb.example | 14 ++++++++++++++ config/docker.yml.erb.travis | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/config/docker.yml.erb.example b/config/docker.yml.erb.example index 2aba0be0..eb1af61e 100644 --- a/config/docker.yml.erb.example +++ b/config/docker.yml.erb.example @@ -34,6 +34,20 @@ 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://127.0.0.1:2376 diff --git a/config/docker.yml.erb.travis b/config/docker.yml.erb.travis index 2aba0be0..eb1af61e 100644 --- a/config/docker.yml.erb.travis +++ b/config/docker.yml.erb.travis @@ -34,6 +34,20 @@ 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://127.0.0.1:2376