foreman_docker 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -1
  3. data/app/controllers/api/v2/containers_controller.rb +1 -1
  4. data/app/models/foreman_docker/docker.rb +8 -7
  5. data/app/views/registries/_form.html.erb +3 -3
  6. data/lib/foreman_docker/version.rb +1 -1
  7. metadata +78 -78
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 86749f058604f314afa36079efedb8335d2ef47e
4
- data.tar.gz: b8ef0a060b0475b26e09b4a6cf2696d544005d80
3
+ metadata.gz: 641634385303418110c23b2516bc9eeabdf5851a
4
+ data.tar.gz: ba787b7bda686cb0b8f117387928656b97f1dd1a
5
5
  SHA512:
6
- metadata.gz: 448a15eb9db1bfa4ed7f18037ab4cb9ff094ba7887663016b9a960bca4403ce24e419f02440c60c8baea03a961d31b66d7c003868e0ef72dd397a5fe19628708
7
- data.tar.gz: 2ca249ac65d7589834c7f583312b180d6689ad8b20f85811a2aecd2c99704d20f34377b29e0a97ee47988a089c2ddd414bba0378afd191e6e9797d5ce52f9460
6
+ metadata.gz: 5f44dbbc9ce8d205725004ed20ca8752610a012f86c8e1940cf31337a66fa6c3d3991cf461201b9aee84693f0d11acd690525d9b56909543397ba9cfc9a67274
7
+ data.tar.gz: 244b131747e87fa896fbcb103c82b676754e3f985f6ee78b83f14888a42966145cf24a69570453e8f8f91b1ebd72b87459194c212a3f376e9efa10d2938c5c96
data/README.md CHANGED
@@ -3,6 +3,7 @@
3
3
  [![Code Climate](https://codeclimate.com/github/theforeman/foreman-docker/badges/gpa.svg)](https://codeclimate.com/github/theforeman/foreman-docker)
4
4
  [![Gem Version](https://badge.fury.io/rb/foreman_docker.svg)](http://badge.fury.io/rb/foreman_docker)
5
5
  [![Dependency Status](https://gemnasium.com/theforeman/foreman-docker.svg)](https://gemnasium.com/theforeman/foreman-docker)
6
+ [![Issue Stats](http://issuestats.com/github/theforeman/foreman-docker/badge/pr)](http://issuestats.com/github/theforeman/foreman-docker)
6
7
 
7
8
  ```foreman_docker``` enables provisioning and managing of [Docker](http://docker.com) containers and images in [Foreman](http://github.com/theforeman/foreman), all of that under the GPL v3+ license.
8
9
 
@@ -85,7 +86,7 @@ That's it. You're now ready to create and manage containers in your new Docker c
85
86
  | ---------------:| --------------:|
86
87
  | >= 1.5 | 0.0.1 - 0.0.3 |
87
88
  | >= 1.6 | 0.1.0 - 0.2.0 |
88
- | >= 1.7 | 1.0.0 |
89
+ | >= 1.7 | 1.0.0+ |
89
90
 
90
91
  We will follow [Semantic Versioning 2.0.0](http://semver.org/spec/v2.0.0.html). This means:
91
92
  * MAJOR versions: will break compatibility with the latest supported Foreman version. For instance, foreman-docker 1.0 breaks Foreman 1.6 compatibility.
data/app/controllers/api/v2/containers_controller.rb CHANGED
@@ -7,7 +7,7 @@ module Api
7
7
  resource_description do
8
8
  resource_id 'containers'
9
9
  api_version 'v2'
10
- api_base_url '/api/v2'
10
+ api_base_url '/docker/api/v2'
11
11
  end
12
12
 
13
13
  api :GET, '/containers/', N_('List all containers')
data/app/models/foreman_docker/docker.rb CHANGED
@@ -131,13 +131,14 @@ module ForemanDocker
131
131
  end
132
132
 
133
133
  def client
134
- @client ||= ::Fog::Compute.new(
135
- :provider => 'fogdocker',
136
- :docker_username => user,
137
- :docker_password => password,
138
- :docker_email => email,
139
- :docker_url => url
140
- )
134
+ opts = {
135
+ :provider => 'fogdocker',
136
+ :docker_url => url
137
+ }
138
+ opts[:docker_username] = user if user.present?
139
+ opts[:docker_password] = password if password.present?
140
+ opts[:docker_email] = email if email.present?
141
+ @client ||= ::Fog::Compute.new(opts)
141
142
  end
142
143
 
143
144
  def api_version
data/app/views/registries/_form.html.erb CHANGED
@@ -12,9 +12,9 @@
12
12
 
13
13
  <div class="tab-content">
14
14
  <div class="tab-pane active" id="primary">
15
- <%= text_f f, :name, :help_inline => _("Registry name") %>
16
- <%= text_f f, :url, :help_inline => _("Registry url") %>
17
- <%= text_f f, :description, :help_inline => _("Describing of the registry") %>
15
+ <%= text_f f, :name %>
16
+ <%= text_f f, :url %>
17
+ <%= text_f f, :description, :help_inline => _("Description of the registry") %>
18
18
  <%= text_f f, :username, :help_inline => _("Username used to access the registry") %>
19
19
  <%= password_f f, :password, :help_inline => _("Password used for authentication to the registry") %>
20
20
  </div>
data/lib/foreman_docker/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ForemanDocker
2
- VERSION = '1.2.0'
2
+ VERSION = '1.2.1'
3
3
  end
metadata CHANGED
@@ -1,41 +1,41 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_docker
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Daniel Lobato, Amos Benari
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-02-24 00:00:00.000000000 Z
11
+ date: 2015-03-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: docker-api
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - '='
18
18
  - !ruby/object:Gem::Version
19
19
  version: '1.17'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - '='
25
25
  - !ruby/object:Gem::Version
26
26
  version: '1.17'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: wicked
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: '1.1'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '1.1'
41
41
  description: Provision and manage Docker containers and images from Foreman.
@@ -45,99 +45,99 @@ executables: []
45
45
  extensions: []
46
46
  extra_rdoc_files: []
47
47
  files:
48
- - app/views/compute_resources/form/_docker.html.erb
49
- - app/views/compute_resources/show/_docker.html.erb
50
- - app/views/image_search/_repository_search_results.html.erb
48
+ - LICENSE
49
+ - README.md
50
+ - Rakefile
51
+ - app/assets/javascripts/foreman_docker/image_step.js
52
+ - app/assets/stylesheets/foreman_docker/autocomplete.css.scss
53
+ - app/assets/stylesheets/foreman_docker/terminal.css.scss
54
+ - app/controllers/api/v2/containers_controller.rb
55
+ - app/controllers/concerns/foreman_docker/find_container.rb
56
+ - app/controllers/containers/steps_controller.rb
57
+ - app/controllers/containers_controller.rb
58
+ - app/controllers/image_search_controller.rb
59
+ - app/controllers/registries_controller.rb
60
+ - app/helpers/container_steps_helper.rb
61
+ - app/helpers/containers_helper.rb
62
+ - app/models/concerns/fog_extensions/fogdocker/image.rb
63
+ - app/models/concerns/fog_extensions/fogdocker/images.rb
64
+ - app/models/concerns/fog_extensions/fogdocker/server.rb
65
+ - app/models/concerns/foreman_docker/parameter_validators.rb
66
+ - app/models/container.rb
67
+ - app/models/docker_container_wizard_state.rb
68
+ - app/models/docker_container_wizard_states/configuration.rb
69
+ - app/models/docker_container_wizard_states/environment.rb
70
+ - app/models/docker_container_wizard_states/environment_variable.rb
71
+ - app/models/docker_container_wizard_states/image.rb
72
+ - app/models/docker_container_wizard_states/preliminary.rb
73
+ - app/models/docker_registry.rb
74
+ - app/models/environment_variable.rb
75
+ - app/models/foreman_docker/docker.rb
76
+ - app/models/foreman_docker/taxonomy_extensions.rb
77
+ - app/models/service/containers.rb
78
+ - app/models/service/registry_api.rb
79
+ - app/views/api/v1/compute_resources/docker.json
51
80
  - app/views/api/v2/compute_resources/docker.json
52
- - app/views/api/v2/containers/main.json.rabl
53
81
  - app/views/api/v2/containers/base.json.rabl
54
82
  - app/views/api/v2/containers/index.json.rabl
83
+ - app/views/api/v2/containers/main.json.rabl
55
84
  - app/views/api/v2/containers/show.json.rabl
56
- - app/views/api/v1/compute_resources/docker.json
57
- - app/views/containers/steps/environment.html.erb
58
- - app/views/containers/steps/_title.html.erb
85
+ - app/views/compute_resources/form/_docker.html.erb
86
+ - app/views/compute_resources/show/_docker.html.erb
87
+ - app/views/compute_resources_vms/form/_docker.html.erb
88
+ - app/views/compute_resources_vms/index/_docker.html.erb
89
+ - app/views/compute_resources_vms/show/_docker.html.erb
90
+ - app/views/containers/_list.html.erb
91
+ - app/views/containers/index.html.erb
92
+ - app/views/containers/show.html.erb
59
93
  - app/views/containers/steps/_form_buttons.html.erb
60
- - app/views/containers/steps/image.html.erb
61
- - app/views/containers/steps/preliminary.html.erb
62
94
  - app/views/containers/steps/_image_hub_tab.html.erb
95
+ - app/views/containers/steps/_title.html.erb
63
96
  - app/views/containers/steps/configuration.html.erb
64
- - app/views/containers/_list.html.erb
65
- - app/views/containers/show.html.erb
66
- - app/views/containers/index.html.erb
67
- - app/views/registries/edit.html.erb
68
- - app/views/registries/new.html.erb
69
- - app/views/registries/_form.html.erb
70
- - app/views/registries/index.html.erb
97
+ - app/views/containers/steps/environment.html.erb
98
+ - app/views/containers/steps/image.html.erb
99
+ - app/views/containers/steps/preliminary.html.erb
71
100
  - app/views/foreman_docker/common_parameters/_environment_variable.html.erb
101
+ - app/views/image_search/_repository_search_results.html.erb
72
102
  - app/views/images/form/_docker.html.erb
73
- - app/views/compute_resources_vms/form/_docker.html.erb
74
- - app/views/compute_resources_vms/index/_docker.html.erb
75
- - app/views/compute_resources_vms/show/_docker.html.erb
76
- - app/models/docker_registry.rb
77
- - app/models/service/registry_api.rb
78
- - app/models/service/containers.rb
79
- - app/models/concerns/fog_extensions/fogdocker/image.rb
80
- - app/models/concerns/fog_extensions/fogdocker/images.rb
81
- - app/models/concerns/fog_extensions/fogdocker/server.rb
82
- - app/models/concerns/foreman_docker/parameter_validators.rb
83
- - app/models/docker_container_wizard_state.rb
84
- - app/models/container.rb
85
- - app/models/environment_variable.rb
86
- - app/models/foreman_docker/taxonomy_extensions.rb
87
- - app/models/foreman_docker/docker.rb
88
- - app/models/docker_container_wizard_states/environment.rb
89
- - app/models/docker_container_wizard_states/image.rb
90
- - app/models/docker_container_wizard_states/configuration.rb
91
- - app/models/docker_container_wizard_states/environment_variable.rb
92
- - app/models/docker_container_wizard_states/preliminary.rb
93
- - app/controllers/api/v2/containers_controller.rb
94
- - app/controllers/containers/steps_controller.rb
95
- - app/controllers/concerns/foreman_docker/find_container.rb
96
- - app/controllers/registries_controller.rb
97
- - app/controllers/image_search_controller.rb
98
- - app/controllers/containers_controller.rb
99
- - app/helpers/containers_helper.rb
100
- - app/helpers/container_steps_helper.rb
101
- - app/assets/javascripts/foreman_docker/image_step.js
102
- - app/assets/stylesheets/foreman_docker/terminal.css.scss
103
- - app/assets/stylesheets/foreman_docker/autocomplete.css.scss
103
+ - app/views/registries/_form.html.erb
104
+ - app/views/registries/edit.html.erb
105
+ - app/views/registries/index.html.erb
106
+ - app/views/registries/new.html.erb
104
107
  - config/routes.rb
105
- - db/migrate/20141018110810_add_uuid_to_containers.rb
106
- - db/migrate/20141028164206_change_memory_in_container.rb
108
+ - db/migrate/20140930175337_add_email_to_compute_resource.rb
107
109
  - db/migrate/20141005233312_create_containers.rb
108
- - db/migrate/20141028164633_change_cpuset_in_container.rb
109
- - db/migrate/20141009011026_add_attributes_to_container.rb
110
- - db/migrate/20141222113313_create_wizard_states.rb
111
- - db/migrate/20150129054944_add_katello_flag_to_containers.rb
112
110
  - db/migrate/20141007225130_add_compute_resource_id_to_container.rb
113
111
  - db/migrate/20141009001613_add_tag_to_container.rb
114
- - db/migrate/20141120123003_add_user_credentials_to_docker_registries.rb
115
- - db/migrate/20140930175337_add_email_to_compute_resource.rb
112
+ - db/migrate/20141009011026_add_attributes_to_container.rb
116
113
  - db/migrate/20141010173220_create_docker_images.rb
117
- - db/migrate/20150122011747_add_katello_flag_to_docker_wizard_image.rb
114
+ - db/migrate/20141018110810_add_uuid_to_containers.rb
118
115
  - db/migrate/20141024163003_create_docker_registries.rb
116
+ - db/migrate/20141028164206_change_memory_in_container.rb
117
+ - db/migrate/20141028164633_change_cpuset_in_container.rb
118
+ - db/migrate/20141120123003_add_user_credentials_to_docker_registries.rb
119
119
  - db/migrate/20141209182008_remove_docker_tables.rb
120
+ - db/migrate/20141222113313_create_wizard_states.rb
121
+ - db/migrate/20150122011747_add_katello_flag_to_docker_wizard_image.rb
122
+ - db/migrate/20150129054944_add_katello_flag_to_containers.rb
123
+ - lib/foreman_docker.rb
124
+ - lib/foreman_docker/engine.rb
120
125
  - lib/foreman_docker/tasks/test.rake
121
126
  - lib/foreman_docker/version.rb
122
- - lib/foreman_docker/engine.rb
123
- - lib/foreman_docker.rb
124
127
  - locale/Makefile
125
- - LICENSE
126
- - Rakefile
127
- - README.md
128
- - test/functionals/api/v2/containers_controller_test.rb
129
- - test/functionals/containers_steps_controller_test.rb
130
- - test/functionals/container_controller_test.rb
131
- - test/factories/docker_registry.rb
132
128
  - test/factories/compute_resources.rb
133
129
  - test/factories/containers.rb
130
+ - test/factories/docker_registry.rb
131
+ - test/functionals/api/v2/containers_controller_test.rb
132
+ - test/functionals/container_controller_test.rb
133
+ - test/functionals/containers_steps_controller_test.rb
134
+ - test/integration/container_steps_test.rb
135
+ - test/integration/container_test.rb
136
+ - test/test_plugin_helper.rb
134
137
  - test/units/container_test.rb
138
+ - test/units/containers_service_test.rb
135
139
  - test/units/docker_registry_test.rb
136
140
  - test/units/registry_api_test.rb
137
- - test/units/containers_service_test.rb
138
- - test/test_plugin_helper.rb
139
- - test/integration/container_steps_test.rb
140
- - test/integration/container_test.rb
141
141
  homepage: http://github.com/theforeman/foreman-docker
142
142
  licenses:
143
143
  - GPL-3
@@ -148,17 +148,17 @@ require_paths:
148
148
  - lib
149
149
  required_ruby_version: !ruby/object:Gem::Requirement
150
150
  requirements:
151
- - - '>='
151
+ - - ">="
152
152
  - !ruby/object:Gem::Version
153
153
  version: '0'
154
154
  required_rubygems_version: !ruby/object:Gem::Requirement
155
155
  requirements:
156
- - - '>='
156
+ - - ">="
157
157
  - !ruby/object:Gem::Version
158
158
  version: '0'
159
159
  requirements: []
160
160
  rubyforge_project:
161
- rubygems_version: 2.0.14
161
+ rubygems_version: 2.4.5
162
162
  signing_key:
163
163
  specification_version: 4
164
164
  summary: Provision and manage Docker containers and images from Foreman