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

Enhance kill for container

Browse Source
This commit is contained in:
Sebastian Serth
2020-03-25 11:47:59 +01:00
parent b0761dbdb5
commit 380b2ce6c7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/docker_client.rb
View File

@ -230,12 +230,12 @@ class DockerClient
@socket.close @socket.close
end end
Rails.logger.info('destroying container ' + container.to_s) Rails.logger.info('destroying container ' + container.to_s)
container.stop.kill
container.port_bindings.values.each { |port| PortPool.release(port) }
clean_container_workspace(container)
# Checks only if container assignment is not nil and not whether the container itself is still present. # Checks only if container assignment is not nil and not whether the container itself is still present.
if container && !DockerContainerPool.config[:active] if container && !DockerContainerPool.config[:active]
clean_container_workspace(container)
container.stop.kill
container.port_bindings.values.each { |port| PortPool.release(port) }
container.delete(force: true, v: true) container.delete(force: true, v: true)
elsif container elsif container
DockerContainerPool.destroy_container(container) DockerContainerPool.destroy_container(container)