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

removed calls to the docker daemon, to hopefully solve load problems.

Browse Source
This commit is contained in:
Ralf Teusner
2015-11-09 19:26:56 +01:00
parent b05b24ee62
commit e927a39041
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/docker_client.rb
View File

@ -239,6 +239,7 @@ class DockerClient
end end
def self.find_image_by_tag(tag) def self.find_image_by_tag(tag)
# todo: cache this.
Docker::Image.all.detect { |image| image.info['RepoTags'].flatten.include?(tag) } Docker::Image.all.detect { |image| image.info['RepoTags'].flatten.include?(tag) }
end end
@ -252,8 +253,10 @@ class DockerClient
def initialize(options = {}) def initialize(options = {})
@execution_environment = options[:execution_environment] @execution_environment = options[:execution_environment]
@image = self.class.find_image_by_tag(@execution_environment.docker_image) # todo: eventually re-enable this if it is cached. But in the end, we do not need this.
fail(Error, "Cannot find image #{@execution_environment.docker_image}!") unless @image # docker daemon got much too much load. all not 100% necessary calls to the daemon were removed.
#@image = self.class.find_image_by_tag(@execution_environment.docker_image)
#fail(Error, "Cannot find image #{@execution_environment.docker_image}!") unless @image
end end
def self.initialize_environment def self.initialize_environment
@ -261,7 +264,9 @@ class DockerClient
fail(Error, 'Docker configuration missing!') fail(Error, 'Docker configuration missing!')
end end
Docker.url = config[:host] if config[:host] Docker.url = config[:host] if config[:host]
check_availability! # todo: availability check disabled for performance reasons. Reconsider if this is necessary.
# docker daemon got much too much load. all not 100% necessary calls to the daemon were removed.
# check_availability!
FileUtils.mkdir_p(LOCAL_WORKSPACE_ROOT) FileUtils.mkdir_p(LOCAL_WORKSPACE_ROOT)
end end