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

Deprecate the 'restart' daemon option (obsolete since docker 1.2.0). #237

Merged
merged 1 commit into from
Nov 19, 2014
Merged

Deprecate the 'restart' daemon option (obsolete since docker 1.2.0). #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -165,7 +165,7 @@ no_proxy | NO_PROXY environment variable | String | nil
options | Additional options to pass to docker. These could be flags like "-api-enable-cors". | String | nil
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
restart | Restart containers on boot | TrueClass or FalseClass | auto-detected (see attributes/default.rb)
restart (*DEPRECATED*) | Restart containers on boot | TrueClass or FalseClass | auto-detected (see attributes/default.rb)
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
1 change: 1 addition & 0 deletions attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,4 +186,5 @@

# Other attributes

# DEPRECATED: will be removed in chef-docker 1.0
default['docker']['restart'] = false if node['docker']['container_init_type']
1 change: 1 addition & 0 deletions spec/systemd_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
end
end

# DEPRECATED: will be removed in chef-docker 1.0
context 'when container_init_type is set' do
let(:chef_run) do
runner = ChefSpec::Runner.new
Expand Down
1 change: 1 addition & 0 deletions spec/sysv_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
end
end

# DEPRECATED: will be removed in chef-docker 1.0
context 'when container_init_type is set' do
let(:chef_run) do
runner = ChefSpec::Runner.new
Expand Down
1 change: 1 addition & 0 deletions spec/upstart_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
end
end

# DEPRECATED: will be removed in chef-docker 1.0
context 'when container_init_type is set' do
let(:chef_run) do
runner = ChefSpec::Runner.new
Expand Down