Skip to content
This repository was archived by the owner on Mar 16, 2021. It is now read-only.

Commit e054355

Browse files
committed
Revert "Fixes #8409 - Pull docker image asynchronously"
This reverts commit 16234b2. Conflicts: app/models/service/containers.rb
1 parent 63ae5d9 commit e054355

4 files changed

Lines changed: 0 additions & 28 deletions

File tree

app/models/container.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
class Container < ActiveRecord::Base
22
include Authorizable
33
include Taxonomix
4-
include ForemanTasks::Concerns::ActionSubject
54

65
belongs_to :compute_resource
76
belongs_to :registry, :class_name => "DockerRegistry", :foreign_key => :registry_id

app/models/service/actions/compute_resource/pull.rb

Lines changed: 0 additions & 21 deletions
This file was deleted.

foreman_docker.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ Gem::Specification.new do |s|
2020

2121
s.add_dependency 'docker-api', '~> 1.13'
2222
s.add_dependency 'wicked', '~> 1.1'
23-
s.add_dependency 'foreman-tasks'
2423
s.add_development_dependency 'rubocop', '~> 0.26'
2524
end

lib/foreman_docker/engine.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ class Engine < ::Rails::Engine
1414
config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
1515
config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
1616

17-
initializer "foreman_docker.require_dynflow",
18-
:before => "foreman_tasks.initialize_dynflow" do |app|
19-
ForemanTasks.dynflow.require!
20-
end
21-
2217
initializer 'foreman_docker.load_app_instance_data' do |app|
2318
app.config.paths['db/migrate'] += ForemanDocker::Engine.paths['db/migrate'].existent
2419
end

0 commit comments

Comments
 (0)