Project

General

Profile

Revision 5397ee73

Added by David Davis over 7 years ago

Fixes #9382 - Use connection info when connecting to docker

View differences:

app/controllers/containers_controller.rb
16 16

  
17 17
  def new
18 18
    redirect_to wizard_state_step_path(:wizard_state_id => DockerContainerWizardState.create.id,
19
                                       :id              => :preliminary)
19
                                       :id => :preliminary)
20 20
  end
21 21

  
22 22
  def destroy
23 23
    if container_deletion
24 24
      process_success(:success_redirect => containers_path,
25
                      :success_msg      => (_("Container %s is being deleted.") %
25
                      :success_msg => (_("Container %s is being deleted.") %
26 26
                                            @deleted_identifier))
27 27
    else
28 28
      process_error(:redirect => containers_path)
......
35 35
  end
36 36

  
37 37
  def commit
38
    Docker::Container.get(@container.uuid).commit(:author  => params[:commit][:author],
39
                                                  :repo    => params[:commit][:repo],
40
                                                  :tag     => params[:commit][:tag],
41
                                                  :comment => params[:commit][:comment])
38
    ForemanDocker::Docker.get_container(@container).commit(:author  => params[:commit][:author],
39
                                                           :repo => params[:commit][:repo],
40
                                                           :tag => params[:commit][:tag],
41
                                                           :comment => params[:commit][:comment])
42 42

  
43 43
    process_success :success_redirect => :back,
44 44
                    :success_msg      => _("%{container} commit was successful") %

Also available in: Unified diff