Remove usage of DockerClient from execution_environments_controller.rb

2021-10-24 11:21:24 +02:00
parent 541afa92f3
commit 2b98905acb
5 changed files with 25 additions and 5 deletions
--- a/app/controllers/execution_environments_controller.rb
+++ b/app/controllers/execution_environments_controller.rb
@ -133,12 +133,12 @@ class ExecutionEnvironmentsController < ApplicationController
  end

  def set_docker_images
-    DockerClient.check_availability!
-    @docker_images = DockerClient.image_tags.sort
-  rescue DockerClient::Error => e
-    @docker_images = []
+    @docker_images ||= ExecutionEnvironment.pluck(:docker_image)
+    @docker_images += Runner.strategy_class.available_images
+  rescue Runner::Error::InternalServerError => e
    flash[:warning] = e.message
-    Sentry.capture_exception(e)
+  ensure
+    @docker_images = @docker_images.sort.uniq
  end
  private :set_docker_images