Skip to content

Commit

Permalink
add support for docker labels
Browse files Browse the repository at this point in the history
  • Loading branch information
jovandeginste committed Aug 13, 2015
1 parent 32b6e4f commit 9a6545d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions lib/puppet/parser/functions/docker_run_flags.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ module Puppet::Parser::Functions
['-e %s', 'env'],
['--env-file %s', 'env_file'],
['-p %s', 'ports'],
['-l %s', 'labels'],
['--add-host %s', 'hostentries'],
['-v %s', 'volumes'],
['-H %s', 'socket_connect'],
Expand Down
2 changes: 2 additions & 0 deletions manifests/run.pp
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
$memory_limit = '0b',
$cpuset = [],
$ports = [],
$labels = [],
$expose = [],
$volumes = [],
$links = [],
Expand Down Expand Up @@ -124,6 +125,7 @@
memory_limit => $memory_limit,
net => $net,
ports => any2array($ports),
labels => any2array($labels),
privileged => $privileged,
socket_connect => any2array($socket_connect),
tty => $tty,
Expand Down

0 comments on commit 9a6545d

Please sign in to comment.