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

Added some roadmap

Browse Source
This commit is contained in:
Jan Renz
2015-04-28 13:46:56 +02:00
parent 9d456c219b
commit b8e35274ac
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/docker_client.rb
View File

@ -83,7 +83,10 @@ class DockerClient
Rails.logger.info('destroying container ' + container.to_s)
container.stop.kill
container.port_bindings.values.each { |port| PortPool.release(port) }
Pathname.new(local_workspace_path).children.each{ |p| p.rmtree} if local_workspace_path(container)
local_workspace_path = local_workspace_path(container)
if local_workspace_path && Pathname.new(local_workspace_path).exist?
Pathname.new(local_workspace_path).children.each{ |p| p.rmtree}
end
container.delete(force: true)
end
@ -94,9 +97,9 @@ class DockerClient
def execute_command(command, before_execution_block, output_consuming_block)
#tries ||= 0
@container = DockerContainerPool.get_container(@execution_environment)
#clear directory (it should be emtpy anyhow)
Pathname.new(local_workspace_path).children.each{ |p| p.rmtree}
if @container
#clear directory (it should be emtpy anyhow)
Pathname.new(self.class.local_workspace_path(@container)).children.each{ |p| p.rmtree}
before_execution_block.try(:call)
send_command(command, @container, &output_consuming_block)
else
@ -202,6 +205,5 @@ class DockerClient
end
private :send_command
class Error < RuntimeError; end
end