From b13a3b084d3f38778e51b2e079aaffafbc4fd98c Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Fri, 29 Oct 2021 22:32:15 +0200 Subject: [PATCH] Use new available_images routes from DCP --- lib/runner/strategy/docker_container_pool.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/runner/strategy/docker_container_pool.rb b/lib/runner/strategy/docker_container_pool.rb index fdfe945a..977fe02d 100644 --- a/lib/runner/strategy/docker_container_pool.rb +++ b/lib/runner/strategy/docker_container_pool.rb @@ -88,10 +88,16 @@ class Runner::Strategy::DockerContainerPool < Runner::Strategy end def self.available_images - DockerClient.check_availability! - DockerClient.image_tags - rescue DockerClient::Error => e - raise Runner::Error::InternalServerError.new(e.message) + url = "#{config[:pool][:location]}/docker_container_pool/available_images" + response = Faraday.get(url) + json = JSON.parse(response.body) + return json if response.success? + + raise Runner::Error::InternalServerError.new("DockerContainerPool returned: #{json['error']}") + rescue Faraday::Error => e + raise Runner::Error::FaradayError.new("Request to DockerContainerPool failed: #{e.inspect}") + rescue JSON::ParserError => e + raise Runner::Error::UnexpectedResponse.new("DockerContainerPool returned invalid JSON: #{e.inspect}") end def self.config