Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Further deprecate daemon restart flag by default, which interferes with restart policies #298

Merged
merged 3 commits into from
Apr 14, 2015
Merged

Further deprecate daemon restart flag by default, which interferes with restart policies #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
910c9d5
Further deprecate daemon restart flag by default, which interferes wi…
bflad Apr 14, 2015
0ba7ea0
Update daemon restart nil default in README
bflad Apr 14, 2015
be9993b
Update restart=false spec tests for attribute default change
bflad Apr 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ options | Additional options to pass to docker. These could be flags like "-api-
pidfile | Path to use for daemon PID file | String | nil (implicitly /var/run/docker.pid)
ramdisk | Set DOCKER_RAMDISK when using RAM disk | TrueClass or FalseClass | false
registry-mirror | List of docker registry mirrors | String, Array | nil
restart (*DEPRECATED*) | Restart containers on boot | TrueClass or FalseClass | auto-detected (see attributes/default.rb)
restart (*DEPRECATED*) | Restart containers on boot | TrueClass or FalseClass | nil
selinux_enabled | Enable SELinux | TrueClass or FalseClass | nil
storage_driver | Storage driver for docker | String | nil
storage_opt | Storage driver options | String, Array | nil
Expand Down
2 changes: 1 addition & 1 deletion attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,4 @@
# Other attributes

# DEPRECATED: will be removed in chef-docker 1.0
default['docker']['restart'] = false if node['docker']['container_init_type']
default['docker']['restart'] = nil
4 changes: 2 additions & 2 deletions spec/systemd_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@
end

# DEPRECATED: will be removed in chef-docker 1.0
context 'when container_init_type is set' do
context 'when restart is set' do
let(:chef_run) do
runner = ChefSpec::SoloRunner.new
runner.node.set['docker']['container_init_type'] = 'upstart'
runner.node.set['docker']['restart'] = false
runner.converge(described_recipe)
end

Expand Down
4 changes: 2 additions & 2 deletions spec/sysv_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@
end

# DEPRECATED: will be removed in chef-docker 1.0
context 'when container_init_type is set' do
context 'when restart is set' do
let(:chef_run) do
runner = ChefSpec::SoloRunner.new
runner.node.set['docker']['container_init_type'] = 'upstart'
runner.node.set['docker']['restart'] = false
runner.converge(described_recipe)
end

Expand Down
4 changes: 2 additions & 2 deletions spec/upstart_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@
end

# DEPRECATED: will be removed in chef-docker 1.0
context 'when container_init_type is set' do
context 'when restart is set' do
let(:chef_run) do
runner = ChefSpec::SoloRunner.new
runner.node.set['docker']['container_init_type'] = 'upstart'
runner.node.set['docker']['restart'] = false
runner.converge(described_recipe)
end

Expand Down