Fix: major update, docker::ce and compose classes

4 files changed, 53 insertions, 32 deletions

diff --git a/manifests/ce.pp b/manifests/ce.pp
new file mode 100644
index 0000000..0ab22f6
--- /dev/null
+++ b/manifests/ce.pp
@@ -0,0 +1,33 @@
+# See https://linuxconfig.org/how-to-install-docker-on-debian-9-stretch-linux
+class docker::ce inherits docker {
+  $distro = downcase($::lsbdistid)
+
+  file { '/etc/apt/trusted.gpg.d/docker.gpg':
+    ensure => present,
+    mode   => '0644',
+    owner  => 'root',
+    group  => 'root',
+    source => "puppet:///modules/docker/${distro}.gpg",
+  }
+
+  file { '/etc/apt/sources.list.d/docker.list':
+    ensure  => present,
+    owner   => "root",
+    group   => "root",
+    mode    => "0644",
+    content => "deb [arch=${::architecture}] https://download.docker.com/linux/${distro} ${::lsbdistcodename} stable\n",
+    require => File['/etc/apt/trusted.gpg.d/docker.gpg'],
+    notify  => Exec['docker-apt-auto-update'],
+  }
+
+  exec { 'docker-apt-auto-update':
+    command     => "/usr/bin/apt-get update",
+    user        => "root",
+    refreshonly => true,
+  }
+
+  Package['docker'] {
+    name    => 'docker-ce',
+    require => File['/etc/apt/sources.list.d/docker.list'],
+  }
+}
diff --git a/manifests/compose.pp b/manifests/compose.pp
new file mode 100644
index 0000000..e503339
--- /dev/null
+++ b/manifests/compose.pp
@@ -0,0 +1,5 @@
+class docker::compose {
+  package { 'docker-compose':
+    ensure => present,
+  }
+}
diff --git a/manifests/compose/upstream.pp b/manifests/compose/upstream.pp
new file mode 100644
index 0000000..05d06db
--- /dev/null
+++ b/manifests/compose/upstream.pp
@@ -0,0 +1,12 @@
+class docker::compose::upstream(
+    $version = '1.29.0',
+  ) {
+
+  $url  = "https://github.com/docker/compose/releases/download/${version}/docker-compose-$(uname -s)-$(uname -m)"
+  $dest = "/usr/local/bin/docker-compose"
+
+  exec { 'get-docker-compoe':
+    command => "/usr/bin/curl -L \"${url}\" -o ${dest} && chmod +x ${dest}",
+    creeats => "${dest}",
+  }
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index 3b10347..85838af 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,39 +1,10 @@
-# See https://linuxconfig.org/how-to-install-docker-on-debian-9-stretch-linux
 class docker {
-  $distro = downcase($::lsbdistid)
-
-  file { '/etc/apt/trusted.gpg.d/docker.gpg':
+  package { 'docker':
     ensure => present,
-    mode   => '0644',
-    owner  => 'root',
-    group  => 'root',
-    source => 'puppet:///modules/docker/docker.gpg',
-  }
-
-  file { '/etc/apt/sources.list.d/docker.list':
-    ensure  => present,
-    owner   => "root",
-    group   => "root",
-    mode    => "0644",
-    content => "deb [arch=${::architecture}] https://download.docker.com/linux/${distro} ${::lsbdistcodename} stable\n",
-    require => File['/etc/apt/trusted.gpg.d/docker.gpg'],
-    notify  => Exec['docker-apt-auto-update'],
-  }
-
-  exec { 'docker-apt-auto-update':
-    command     => "/usr/bin/apt-get update",
-    user        => "root",
-    refreshonly => true,
-  }
-
-  package { 'docker-ce':
-    ensure  => present,
-    require => File['/etc/apt/sources.list.d/docker.list'],
   }
 
   service { 'docker' :
-    ensure    => running,
-    enable    => true,
-    require   => Package['docker-ce'],
+    ensure => running,
+    enable => true,
   }
 }