Ajout support Ubuntu et réorganisation

softwares/dockerCE.sls

@@ -70,6 +70,38 @@
           - docker-ce
           - docker-compose
 
+    {% elif grains['os'] == 'Ubuntu' %}
+      {% is grains['osrelease'] == '18.04'}
+        Ubuntu Docker Install Ubuntu 18.04:
+          dpkg.installed:
+            - pkgs:
+              - docker
+              - docker-compose
+      {% else %}
+      {% set UBUVER = salt['grains.get']('oscodename') %}
+        Ubuntu Docker PreRequisites:
+          pkg.installed:
+            - pkgs:
+              - apt-transport-https
+              - ca-certificates
+              - curl
+              - gnupg2
+
+        Ubuntu Docker Add Repo:
+          pkgrepo.managed:
+            - name: deb [arch=amd64] https://download.docker.com/linux/ubuntu {{UBUVER}} stable
+            - file: /etc/apt/sources.list.d/docker-ce.list
+            - enable: 1
+            - key_url: https://download.docker.com/linux/ubuntu/gpg
+
+        Ubuntu Docker CE installation:
+          pkg.installed:
+            - pkgs:
+              - docker-ce
+              - docker-compose
+
+      {% endif %}
+    {% endif %}
     Debian docker Service running:
       service.running:
         - name: docker
@@ -80,7 +112,5 @@
         - name: docker
         - addusers:
           - iwan
-
-    {% endif %}
   {% endif %}
 {% endif %}