From 63f62a8efc78c565ff0d2a129715c0e66bdd7621 Mon Sep 17 00:00:00 2001 From: Alexander Kastius Date: Thu, 11 Aug 2016 19:01:44 +0200 Subject: [PATCH] Reconfigured docker-yml and added missing (something) to application.rb --- Gemfile.lock | 3 --- config/application.rb | 2 ++ config/docker.yml.erb | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 527a91fe..eef6f7f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -417,6 +417,3 @@ DEPENDENCIES uglifier (>= 1.3.0) web-console (~> 2.0) will_paginate (~> 3.0) - -BUNDLED WITH - 1.12.4 diff --git a/config/application.rb b/config/application.rb index 4b2a543a..f180783b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -41,3 +41,5 @@ module CodeOcean end end end + +Rails.application.config.assets.precompile += %w( markdown-buttons.png ) \ No newline at end of file diff --git a/config/docker.yml.erb b/config/docker.yml.erb index 1124e063..9f55d126 100644 --- a/config/docker.yml.erb +++ b/config/docker.yml.erb @@ -7,8 +7,8 @@ default: &default development: <<: *default - host: tcp://192.168.59.104:2376 - ws_host: ws://192.168.59.104:2376 #url to connect rails server to docker host + host: tcp://127.0.0.1:2376 + 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) workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %> pool: