Proxy and no_proxy support

manifests/init.pp

@@ -54,6 +54,12 @@
 #   Any extra parameters that should be passed to the docker daemon.
 #   Defaults to undefined
 #
+# [*proxy*]
+#   Will set the http_proxy and https_proxy env variables in /etc/sysconfig/docker (redhat/centos) or /etc/init/docker.conf (debian)
+#
+# [*no_proxy*]
+#   Will set the no_proxy variable in /etc/sysconfig/docker (redhat/centos) or /etc/init/docker.conf (debian)
+#
 class docker(
   $version                     = $docker::params::version,
   $ensure                      = $docker::params::ensure,
@@ -67,6 +73,8 @@ class docker(
   $manage_kernel               = true,
   $dns                         = $docker::params::dns,
   $extra_parameters            = undef,
+  $proxy                       = $docker::params::proxy,
+  $no_proxy                    = $docker::params::no_proxy,
 ) inherits docker::params {
 
   validate_string($version)

manifests/params.pp

@@ -16,4 +16,6 @@ class docker::params {
     'Debian': { $package_source_location = 'https://get.docker.io/ubuntu' }
     default:  { $package_source_location = '' }
   }
+  $proxy                        = undef
+  $no_proxy                     = undef
 }

manifests/service.pp

@@ -22,6 +22,8 @@ class docker::service (
   $service_enable       = $docker::service_enable,
   $root_dir             = $docker::root_dir,
   $extra_parameters     = $docker::extra_parameters,
+  $proxy                = $docker::proxy,
+  $no_proxy             = $docker::no_proxy,
 ){
   case $::osfamily {
     'Debian': {

templates/etc/init/docker.conf.erb

@@ -6,6 +6,6 @@ stop on runlevel [!2345]
 respawn
 
 script
-  /usr/bin/docker -d <% if @root_dir %>-g <%= @root_dir %><% end %> <% if @tcp_bind %>-H <%= @tcp_bind %><% end %><% if @socket_bind %> -H <%= @socket_bind %><% end %> <% if @dns %> -dns <%= @dns %><% end %><% if @extra_parameters %><% @extra_parameters.each do |param| %> <%= param %><% end %><% end %>
+  <% if @proxy>http_proxy=<%= @proxy %> https_proxy=<%= @proxy %> <% end %><% if @no_proxy>no_proxy=<%= @no_proxy %> <% end %>/usr/bin/docker -d <% if @root_dir %>-g <%= @root_dir %><% end %> <% if @tcp_bind %>-H <%= @tcp_bind %><% end %><% if @socket_bind %> -H <%= @socket_bind %><% end %> <% if @dns %> -dns <%= @dns %><% end %><% if @extra_parameters %><% @extra_parameters.each do |param| %> <%= param %><% end %><% end %>
 end script
 

templates/etc/sysconfig/docker.erb

@@ -1 +1,5 @@
 other_args="<% if @root_dir %>-g <%= @root_dir %><% end %> <% if @tcp_bind %>-H <%= @tcp_bind %><% end %><% if @socket_bind %> -H <%= @socket_bind %><% end %><% if @extra_parameters %><% @extra_parameters.each do |param| %> <%= param %><% end %><% end %>"
+<% if @proxy>http_proxy=<%= @proxy %>
+https_proxy=<%= @proxy %>
+<% end %>
+<% if @no_proxy>no_proxy=<%= @no_proxy %><% end %>