A Flag to deactivate the Escaping for Enviroment Variables

Author: u2382/Mario Sicilia

lib/puppet/parser/functions/docker_run_flags.rb

@@ -61,27 +61,38 @@ module Puppet::Parser::Functions
                          " \\\n"
                        end
 
-    multi_flags = ->(values, fmt) {
+    multi_flags = ->(values, fmt, envescape) {
       filtered = [values].flatten.compact
+      if envescape
       filtered.map { |val| (fmt + params_join_char) % call_function('docker::escape', [val]) }
+      else
+      filtered.map { |val| (fmt + params_join_char) % val }
+      end
     }
 
+    [
+      ['-e %s',             'env'],
+      ['--env-file %s',     'env_file'],
+    ].each do |(format, key)|
+      values    = opts[key]
+      new_flags = multi_flags.call(values, format,opts['env_escape'])
+      flags.concat(new_flags)
+    end
+
     [
       ['--dns %s',          'dns'],
       ['--dns-search %s',   'dns_search'],
       ['--expose=%s',       'expose'],
       ['--link %s',         'links'],
       ['--lxc-conf=%s',     'lxc_conf'],
       ['--volumes-from %s', 'volumes_from'],
-      ['-e %s',             'env'],
-      ['--env-file %s',     'env_file'],
       ['-p %s',             'ports'],
       ['-l %s',             'labels'],
       ['--add-host %s',     'hostentries'],
       ['-v %s',             'volumes'],
     ].each do |(format, key)|
       values    = opts[key]
-      new_flags = multi_flags.call(values, format)
+      new_flags = multi_flags.call(values, format,true)
       flags.concat(new_flags)
     end
 

manifests/run.pp

@@ -254,6 +254,7 @@
   Variant[String,Array]                     $custom_unless                     = [],
   Optional[String]                          $remain_after_exit                 = undef,
   Boolean                                   $prepare_service_only              = false,
+  Optional[Boolean]                         $env_escape                        = true,
 ) {
   include docker::params
 
@@ -337,6 +338,7 @@
       restart_on_unhealthy  => $restart_on_unhealthy,
       health_check_interval => $health_check_interval,
       osfamily              => $facts['os']['family'],
+      env_escape            => $env_escape,
     }
   )