Skip to content

Commit

Permalink
removed $::docker::run::detach parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
glorpen committed Nov 28, 2018
1 parent 1bf7a17 commit f5de8ac
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 13 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,6 @@ This is equivalent to running the `docker run -d base /bin/sh -c "while true; d
```puppet
docker::run { 'helloworld':
image => 'base',
detach => true,
service_prefix => 'docker-',
command => '/bin/sh -c "while true; do echo hello world; sleep 1; done"',
ports => ['4444', '4555'],
Expand Down
7 changes: 0 additions & 7 deletions manifests/run.pp
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
Variant[String,Boolean] $docker_service = false,
Optional[Boolean] $disable_network = false,
Optional[Boolean] $privileged = false,
Optional[Boolean] $detach = undef,
Variant[String,Array[String],Undef] $extra_parameters = undef,
Optional[String] $systemd_restart = 'on-failure',
Variant[String,Hash,Undef] $extra_systemd_parameters = {},
Expand Down Expand Up @@ -170,12 +169,6 @@
assert_type(Pattern[/^(no|always|on-success|on-failure|on-abnormal|on-abort|on-watchdog)$/], $systemd_restart)
}

if $detach == undef {
$valid_detach = $docker::params::detach_service_in_init
} else {
$valid_detach = $detach
}

$extra_parameters_array = any2array($extra_parameters)
$after_array = any2array($after)
$depends_array = any2array($depends)
Expand Down
5 changes: 0 additions & 5 deletions spec/defines/run_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -369,11 +369,6 @@
end
end

context 'should be able to override detached' do
let(:params) { {'command' => 'command', 'image' => 'base', 'detach' => false} }
it { should contain_file(startscript_or_init).without_content(/--detach=true/) }
end

context 'when running with a tty' do
let(:params) { {'command' => 'command', 'image' => 'base', 'tty' => true} }
it { should contain_file(startscript_or_init).with_content(/-t/) }
Expand Down

0 comments on commit f5de8ac

Please sign in to comment.