Enhance kill for container

This commit is contained in:
Sebastian Serth
2020-03-25 11:47:59 +01:00
parent b0761dbdb5
commit 380b2ce6c7

View File

@ -230,12 +230,12 @@ class DockerClient
@socket.close
end
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.
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)
elsif container
DockerContainerPool.destroy_container(container)