From 16aa4925923841cecc37d7efa14e63d421569ce9 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Tue, 14 Apr 2015 12:52:51 +0200 Subject: support command in docker run --- global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp') diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp b/global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp index 8df416b..2552644 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp @@ -7,6 +7,7 @@ define sunet::docker_run( $env = [], $net = 'bridge', $extra_parameters = [], + $command = "" ) { # Make container use unbound resolver on dockerhost @@ -34,6 +35,7 @@ define sunet::docker_run( ]), dns => $dns, verify_checksum => false, # Rely on registry security for now. eduID risk #31. + command => $command, pre_start => 'run-parts /usr/local/etc/docker.d', post_start => 'run-parts /usr/local/etc/docker.d', pre_stop => 'run-parts /usr/local/etc/docker.d', -- cgit v1.1 From ddc16e894133dc37dafb7a2aaa6ae023db9ffb13 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 17 Apr 2015 08:52:38 +0200 Subject: hostname --- global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp') diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp b/global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp index 2552644..4b56a03 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp @@ -7,7 +7,8 @@ define sunet::docker_run( $env = [], $net = 'bridge', $extra_parameters = [], - $command = "" + $command = "", + $hostname = undef, ) { # Make container use unbound resolver on dockerhost @@ -27,6 +28,7 @@ define sunet::docker_run( '/etc/passwd:/etc/passwd:ro', # uid consistency '/etc/group:/etc/group:ro', # gid consistency ]), + hostname => $hostname, ports => $ports, env => $env, net => $net, -- cgit v1.1