Merge pull request #833 from canihavethisone/main

Fix docker-compose, network and volumes not applying on 1st run, fix other idempotency

Author: chelnak

lib/puppet/provider/docker_compose/ruby.rb

@@ -6,16 +6,10 @@
   desc 'Support for Puppet running Docker Compose'
 
   mk_resource_methods
-  commands dockercompose: 'docker-compose'
-  commands dockercmd: 'docker'
 
-  has_command(:docker, command(:dockercmd)) do
-    environment(HOME: '/root')
-  end
+  has_command(:docker, 'docker')
 
-  has_command(:docker_compose, command(:dockercompose)) do
-    environment(HOME: '/root')
-  end
+  has_command(:dockercompose, 'docker-compose')
 
   def set_tmpdir
     return unless resource[:tmpdir]

lib/puppet/provider/docker_network/ruby.rb

@@ -6,11 +6,8 @@
   desc 'Support for Docker Networking'
 
   mk_resource_methods
-  commands dockercmd: 'docker'
 
-  has_command(:docker, command(:dockercmd)) do
-    environment(HOME: '/root')
-  end
+  has_command(:docker, 'docker')
 
   def network_conf
     flags = ['network', 'create']

lib/puppet/provider/docker_stack/ruby.rb

@@ -6,11 +6,8 @@
   desc 'Support for Puppet running Docker Stacks'
 
   mk_resource_methods
-  commands dockercmd: 'docker'
 
-  has_command(:docker, command(:dockercmd)) do
-    environment(HOME: '/root')
-  end
+  has_command(:docker, 'docker')
 
   def exists?
     Puppet.info("Checking for stack #{name}")

lib/puppet/provider/docker_volume/ruby.rb

@@ -6,11 +6,8 @@
   desc 'Support for Docker Volumes'
 
   mk_resource_methods
-  commands dockercmd: 'docker'
 
-  has_command(:docker, command(:dockercmd)) do
-    environment(HOME: '/root')
-  end
+  has_command(:docker, 'docker')
 
   def volume_conf
     flags = ['volume', 'create']

manifests/compose.pp

@@ -100,6 +100,7 @@
       file { $docker_compose_location_versioned:
         owner   => $file_owner,
         mode    => '0755',
+        seltype => 'container_runtime_exec_t',
         require => Exec["Install Docker Compose ${version}"],
       }
 

manifests/params.pp

@@ -91,15 +91,15 @@
 
   if ($facts['os']['family'] == 'windows') {
     $compose_install_path   = "${::docker_program_files_path}/Docker"
-    $compose_version        = '1.21.2'
+    $compose_version        = '1.29.2'
     $docker_ee_package_name = 'Docker'
     $machine_install_path   = "${::docker_program_files_path}/Docker"
     $tls_cacert             = "${::docker_program_data_path}/docker/certs.d/ca.pem"
     $tls_cert               = "${::docker_program_data_path}/docker/certs.d/server-cert.pem"
     $tls_key                = "${::docker_program_data_path}/docker/certs.d/server-key.pem"
   } else {
     $compose_install_path   = '/usr/local/bin'
-    $compose_version        = '1.21.2'
+    $compose_version        = '1.29.2'
     $docker_ee_package_name = 'docker-ee'
     $machine_install_path   = '/usr/local/bin'
     $tls_cacert             = '/etc/docker/tls/ca.pem'

manifests/run.pp

@@ -572,6 +572,7 @@
         file { $startscript:
           ensure  => file,
           content => epp($startstop_template, { 'script' => $docker_run_inline_start }),
+          seltype => 'container_runtime_exec_t',
           owner   => 'root',
           group   => $docker_group,
           mode    => '0770',
@@ -581,6 +582,7 @@
         file { $stopscript:
           ensure  => file,
           content => epp($startstop_template, { 'script' => $docker_run_inline_stop }),
+          seltype => 'container_runtime_exec_t',
           owner   => 'root',
           group   => $docker_group,
           mode    => '0770',
@@ -590,6 +592,7 @@
       file { $initscript:
         ensure  => file,
         content => template($init_template),
+        seltype => 'container_unit_file_t',
         owner   => 'root',
         group   => $docker_group,
         mode    => $mode,

manifests/service.pp

@@ -320,6 +320,7 @@
         file { '/etc/systemd/system/docker.service.d/service-overrides.conf':
           ensure  => file,
           content => template($service_overrides_template),
+          seltype => 'container_unit_file_t',
           notify  => Exec['docker-systemd-reload-before-service'],
           before  => $_manage_service,
         }
@@ -333,6 +334,7 @@
         file { '/etc/systemd/system/docker.socket.d/socket-overrides.conf':
           ensure  => file,
           content => template($socket_overrides_template),
+          seltype => 'container_unit_file_t',
           notify  => Exec['docker-systemd-reload-before-service'],
           before  => $_manage_service,
         }