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

Reconfigured docker-yml and added missing (something) to application.rb

Browse Source
This commit is contained in:
Alexander Kastius
2016-08-11 19:01:44 +02:00
parent 269c592bb8
commit 63f62a8efc
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile.lock
View File

@ -417,6 +417,3 @@ DEPENDENCIES
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
web-console (~> 2.0) web-console (~> 2.0)
will_paginate (~> 3.0) will_paginate (~> 3.0)
BUNDLED WITH
1.12.4

2
config/application.rb
View File

@ -41,3 +41,5 @@ module CodeOcean
end end
end end
end end
Rails.application.config.assets.precompile += %w( markdown-buttons.png )

4
config/docker.yml.erb
View File

@ -7,8 +7,8 @@ default: &default
development: development:
<<: *default <<: *default
host: tcp://192.168.59.104:2376 host: tcp://127.0.0.1:2376
ws_host: ws://192.168.59.104:2376 #url to connect rails server to docker host ws_host: ws://127.0.0.1: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) 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) %> workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %>
pool: pool: