Merge pull request #274 from florindragos/docker_services

Run docker services on windows

Author: davejrt

lib/puppet/parser/functions/docker_service_flags.rb

@@ -66,6 +66,10 @@ module Puppet::Parser::Functions
       flags << "'#{opts['image']}'"
     end
 
+    if opts['command'].to_s != 'undef'
+      flags << opts['command'].to_s
+    end
+
     flags.flatten.join(' ')
   end
 end

manifests/services.pp

@@ -67,6 +67,9 @@
 #  This will allow the service to set a registry mirror.
 #  defaults to undef
 #
+# [*command*]
+#  Command to run on the container
+#
 
 define docker::services(
   Optional[Pattern[/^present$|^absent$/]] $ensure        = 'present',
@@ -86,6 +89,7 @@
   Variant[String,Array,Undef] $workdir                   = undef,
   Variant[String,Array,Undef] $host_socket               = undef,
   Variant[String,Array,Undef] $registry_mirror           = undef,
+  Variant[String,Array,Undef] $command                   = undef,
 ){
 
   include docker::params
@@ -101,6 +105,19 @@
     }
   }
 
+  if $::osfamily == 'windows' {
+    $exec_environment = 'PATH=C:/Program Files/Docker/'
+    $exec_timeout = 3000
+    $exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
+    $exec_provider = 'powershell'
+  } else {
+    $exec_environment = 'HOME=/root'
+    $exec_path = ['/bin', '/usr/bin']
+    $exec_timeout = 0
+    $exec_provider = undef
+  }
+
+
   if $create {
     $docker_service_create_flags = docker_service_flags({
       detach          => $detach,
@@ -116,16 +133,18 @@
       image           => $image,
       host_socket     => $host_socket,
       registry_mirror => $registry_mirror,
+      command         => $command,
     })
 
     $exec_create = "${docker_command} create --name ${docker_service_create_flags}"
-    $unless_create = "docker service ls | grep -w ${service_name}"
+    $unless_create = "docker service ps ${service_name}"
 
     exec { "${title} docker service create":
       command     => $exec_create,
-      environment => 'HOME=/root',
-      path        => ['/bin', '/usr/bin'],
-      timeout     => 0,
+      environment => $exec_environment,
+      path        => $exec_path,
+      timeout     => $exec_timeout,
+      provider    => $exec_provider,
       unless      => $unless_create,
     }
   }
@@ -151,9 +170,10 @@
 
     exec { "${title} docker service update":
       command     => $exec_update,
-      environment => 'HOME=/root',
-      path        => ['/bin', '/usr/bin'],
-      timeout     => 0,
+      environment => $exec_environment,
+      path        => $exec_path,
+      provider    => $exec_provider,
+      timeout     => $exec_timeout,
     }
   }
 
@@ -168,17 +188,20 @@
 
     exec { "${title} docker service scale":
       command     => $exec_scale,
-      environment => 'HOME=/root',
-      path        => ['/bin', '/usr/bin'],
-      timeout     => 0,
+      environment => $exec_environment,
+      path        => $exec_path,
+      timeout     => $exec_timeout,
+      provider    => $exec_provider,
     }
   }
 
   if $ensure == 'absent' {
     exec { "${title} docker service remove":
-      command => "docker service rm ${service_name}",
-      onlyif  => "docker service ls | grep -w ${service_name}",
-      path    => ['/bin', '/usr/bin'],
+      command  => "docker service rm ${service_name}",
+      onlyif   => "docker service ps ${service_name}",
+      path     => $exec_path,
+      provider => $exec_provider,
+      timeout  => $exec_timeout,
     }
   }
 }

spec/acceptance_swarm/swarm_spec.rb

@@ -99,12 +99,23 @@ class { 'docker': #{docker_args} }
         on swarm_worker, 'netsh advfirewall firewall add rule name="Swarm comm udp" dir=in action=allow protocol=UDP localport=7946', :acceptable_exit_codes => [0]
         on swarm_worker, 'netsh advfirewall firewall add rule name="Swarm network" dir=in action=allow protocol=UDP localport=4789', :acceptable_exit_codes => [0]
       end
-
-      on swarm_manager, 'docker network create --driver=overlay swarmnet', :acceptable_exit_codes => [0]
     end
 
     it 'should start a container' do
-      on swarm_manager, "docker service create --name=helloworld --endpoint-mode dnsrr --network=swarmnet #{test_docker_image} #{test_docker_command}", :acceptable_exit_codes => [0]
+      @start_service = <<-code
+      docker::services {'helloworld':
+        create         => true,
+        service_name   => 'helloworld',
+        image          => '#{test_docker_image}',
+        extra_params   => ['--endpoint-mode dnsrr'],
+        command        => '#{test_docker_command}',
+        replicas       => '2',
+        }
+      code
+
+      apply_manifest_on(swarm_manager, @start_service, :catch_failures=>true)
+      
+      #on swarm_manager, "docker service create --name=helloworld --endpoint-mode dnsrr --network=swarmnet #{test_docker_image} #{test_docker_command}", :acceptable_exit_codes => [0]
       on swarm_manager, 'docker service ps helloworld', :acceptable_exit_codes => [0] do |result|
         expect(result.stdout).to match(/Running/)
       end