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

DCP: Refactor container method and usage

Browse Source
This commit is contained in:
Sebastian Serth
2021-10-31 01:02:48 +02:00
parent 537d8bfc95
commit 6a902c41db
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/runner/strategy/docker_container_pool.rb
View File

@ -78,7 +78,7 @@ class Runner::Strategy::DockerContainerPool < Runner::Strategy
@command = command
query_params = 'logs=0&stream=1&stderr=1&stdout=1&stdin=1'
websocket_url = "#{self.class.config[:ws_host]}/v1.27/containers/#{@container_id}/attach/ws?#{query_params}"
websocket_url = "#{self.class.config[:ws_host]}/v1.27/containers/#{container.id}/attach/ws?#{query_params}"
socket = Connection.new(websocket_url, self, event_loop)
begin
@ -150,12 +150,12 @@ class Runner::Strategy::DockerContainerPool < Runner::Strategy
private
def container
return @container if @container.present?
@container ||= begin
container = Docker::Container.get(@container_id)
raise Runner::Error::RunnerNotFound unless container.info['State']['Running']
@container = Docker::Container.get(@container_id)
raise Runner::Error::RunnerNotFound unless @container.info['State']['Running']
@container
container
end
rescue Docker::Error::NotFoundError
raise Runner::Error::RunnerNotFound
end