htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into editor-frontend-refactor

Browse Source 
Conflicts:
	app/assets/javascripts/editor.js.erb
	app/views/exercises/implement.html.slim
This commit is contained in:
Ralf Teusner
2016-09-02 15:04:18 +02:00
parent 18c8927e86 012e11857f
commit b8da4dea17
14 changed files with 178 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config/docker.yml.erb
View File

@@ -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://192.168.59.104:2376