summaryrefslogtreecommitdiff
path: root/global/overlay
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-04-14 12:52:51 +0200
committerLeif Johansson <leifj@sunet.se>2015-04-14 12:52:51 +0200
commit16aa4925923841cecc37d7efa14e63d421569ce9 (patch)
treedb38284d703a6eef6471158b5d90c5b8de7a2ccd /global/overlay
parent3d1ab0bddf7929b94fafdc8347e96c992c93ffff (diff)
support command in docker runsunet-ops-2015-04-14-v09
Diffstat (limited to 'global/overlay')
-rw-r--r--global/overlay/etc/puppet/modules/sunet/manifests/docker_run.pp2
1 files changed, 2 insertions, 0 deletions
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',