Commit Graph

93 Commits

Author SHA1 Message Date
Ralf Teusner
2806d9bf85 specify API version in url used to open the websocket. With version 1.28 and up, docker uses binary frame format for websockets which does not seem to work with FAYE websocket. For API version 1.27 and below, text frame format is used.
+ short fix improvement for empty responses
2017-09-29 16:09:42 +02:00
Ralf Teusner
bdbc372c0c fixed saving run results. also fixed websocket closing. 2017-03-24 18:47:30 +01:00
Tom Staubitz
4674c057a4 Fixed rejection of untagged images 2017-01-18 11:10:34 +01:00
Ralf Teusner
17f0f6fa9f prevent calls on nil 2017-01-11 17:13:34 +01:00
Ralf Teusner
254e8c65d1 adjusted log levels for docker exit and kill messages 2017-01-11 16:04:55 +01:00
Ralf Teusner
f2db88f952 Merge branch 'master' into travis-green-docker
took all the newer versions. Only thing I deleted is the part #to pass the test "it executes the run command" ...
We need to shortly discuss this yqbk.

Conflicts:
	lib/docker_client.rb
2016-11-09 18:25:02 +01:00
yqbk
c937a1a9ef clean pull request 2016-10-24 23:02:44 +02:00
yqbk
f055e6813d changes in travis 2016-10-16 17:21:54 +02:00
yqbk
1f24e48c5c enable docker initialize 2016-10-11 16:45:56 +02:00
yqbk
1945a47109 apply changes after review 2016-10-11 12:44:16 +02:00
Ralf Teusner
1dfd6f61dc some more relative url roots in editor_edit, removed javascript uglifying for staging, added debug message for docker websocket connection url.
added doku for setting up docker daemon for codeocean
2016-10-07 14:16:24 +02:00
Alexander Kastius
6ff3d36809 Fixed container-ending on exit. 2016-09-09 17:06:30 +02:00
yqbk
032c201b94 repair database query 2016-08-03 14:08:01 +02:00
yqbk
4183a16178 merge with master 2016-08-03 12:09:58 +02:00
Ralf Teusner
d29cf9cf61 Also support run output for QaApi 2016-06-17 19:22:25 +02:00
yqbk
ed20a30517 reverse some changes 2016-06-07 13:52:01 +02:00
yqbk
8c9c798a0d solve execute_run_command error 2016-05-30 17:02:29 +02:00
yqbk
060f9687f1 use pry-byebug gem instead for pry (recommended for ruby 2.x) 2016-05-30 15:47:06 +02:00
yqbk
2850e562cc changes in gemfile 2016-05-30 15:18:02 +02:00
yqbk
7bc3c4e27c Fix tests in models/execution_environment_spec.rb, uncomment @image in lib/docker_client.rb 2016-05-25 15:56:49 +02:00
yqbk
4df7bc825b tests creates the workspace files and takes a container from the pool in docker_client_spec.rb repaired 2016-05-24 16:03:55 +02:00
yqbk
a4a8b6393d test creates the workspace files repaired 2016-05-24 15:59:10 +02:00
Ralf Teusner
b31a5b37f4 renamed execute_websocket_command to open_websocket_connection, because we now run the command after all listeners in the submissions controller were attached 2016-03-01 11:34:07 +01:00
Ralf Teusner
94c31e35a4 Some comments and cleanup of exercise.rb percentage calculation 2016-03-01 11:14:53 +01:00
Ralf Teusner
61426e8f2e uncomment some logging, and recreate folder for local workspace path in the docker client. 2016-01-27 15:49:38 +01:00
Ralf Teusner
ecad5b80fa re-enable data submission via shared folders. 2016-01-27 10:16:13 +01:00
Ralf Teusner
f53457644c just remove subfolders of CONTAINER_WORKSPACE_PATH, do not create target folder manually. 2016-01-25 11:19:56 +01:00
Ralf Teusner
d1e0f31963 uncomment sleep 1000 2016-01-25 11:10:41 +01:00
Ralf Teusner
113f765246 docker_client file copy work in progress 2016-01-25 11:07:52 +01:00
Ralf Teusner
c77d52c0e4 instead of relying on shared folders, use docker api archive function. un tar is still a bit cumbersome, but works. 2016-01-19 15:41:03 +01:00
Ralf Teusner
f928874189 directly call proc (before execution block) and rescue from an exception if it happens instead of using try, in order to log the error. 2015-12-16 16:30:54 +01:00
Tom Staubitz
c0955d3505 Just some comments and todos 2015-12-12 00:47:29 +08:00
Ralf Teusner
6170068f24 Major improvement in container fetching. ToDo: Check how much stress this puts on the docker daemon (I assume it is not that much).
+ some more rescue code (in return container) as well as logging fixes.
2015-11-28 16:20:16 +01:00
Ralf Teusner
ae9cfaebf8 some logging and some rescues 2015-11-28 16:10:13 +01:00
Ralf Teusner
207ff90fc8 remove this again. it caused immediate exit. 2015-11-11 00:25:26 +01:00
Ralf Teusner
b1733d1a16 ensure database connection removal activated again 2015-11-10 15:04:21 +01:00
Ralf Teusner
e927a39041 removed calls to the docker daemon, to hopefully solve load problems. 2015-11-09 19:26:56 +01:00
Ralf Teusner
b05b24ee62 some more logging 2015-11-09 10:23:26 +01:00
Ralf Teusner
7f3189615f temporarily uncomment database connection removal (in order to be sure that this does not cause problems) 2015-11-09 09:38:44 +01:00
Ralf Teusner
0fd20c479b set encoding utf-8 for stdout and stderr from docker 2015-11-08 23:55:45 +01:00
Ralf Teusner
1aa877d506 release database connections after thread termination of the "kill after timeout thread" 2015-11-08 12:39:42 +01:00
Ralf Teusner
eb8c0e46fa Some logging, some code simplification, clear canvas on start 2015-11-03 15:54:08 +01:00
Ralf Teusner
ef60494911 some more logging (and cleanup) 2015-10-29 16:27:12 +01:00
Ralf Teusner
b89bd9d521 Turn off log synchronization for websockets. Otherwise, we can't reuse the containers (and terminals) 2015-10-28 16:42:34 +01:00
Ralf Teusner
58b137408e exit the timeout thread on proper exit 2015-10-28 16:25:53 +01:00
Ralf Teusner
30d0270744 Show correct timeout message on timeout. Do not show a message on valid exit. 2015-10-21 17:18:28 +02:00
Ralf Teusner
863ce5d398 Corrected position of setting the container status flags. 2015-10-19 17:48:36 +02:00
Ralf Teusner
9e748e5dc9 prevent nil access on containers not present any longer in delete... 2015-10-19 15:52:48 +02:00
Janusch Jacoby
1360408dce Fix container pooling with websockets 2015-10-19 14:46:32 +02:00
Janusch Jacoby
13be0f65dd Improve error and output handling
Display websocket and container status messages as well as line feeds
to the user.
2015-09-16 19:14:36 +02:00