Merge pull request #276 from hatifnatt/install-python-docker-with-pip

fix(python-docker) install with pip

Author: noelmcloughlin

docker/compose/ng.sls

@@ -16,18 +16,6 @@ include:
         {%- set required_networks = [] %}
 
 {{ formula }}-compose-ng-{{ id }}-present:
-        {%- if 'deps' in d.pkg and d.pkg.deps %}
-            {%- if grains.os|lower == 'centos' %}
-                # https://github.com/saltstack/salt/issues/58920
-  pip.installed:
-    - name: docker
-            {%- endif %}
-  pkg.installed:
-    - names: {{ d.pkg.deps|json }}
-    - reload_modules: {{ d.misc.reload or true }}
-    - require_in:
-      - docker_image: {{ formula }}-compose-ng-{{ id }}-present
-        {%- endif %}
   docker_image.present:
     - force: {{ d.misc.force_present }}
         {%- if ':' in container.image %}

docker/compose/software/binary/install.sls

@@ -11,10 +11,14 @@
 
 {{ formula }}-compose-software-binary-install:
         {%- if 'deps' in d.pkg and d.pkg.deps %}
-            {%- if grains.os|lower == 'centos' %}
+            {%- if grains.os|lower in ('centos', 'redhat') %}
+                # python-docker package is not available or too old on CentOS, RedHat
                 # https://github.com/saltstack/salt/issues/58920
   pip.installed:
     - name: docker
+    - reload_modules: {{ d.misc.reload or true }}
+    - require:
+      - pkg: {{ formula }}-compose-software-binary-install
             {%- endif %}
   pkg.installed:
     - names: {{ d.pkg.deps|json }}

docker/software/archive/install.sls

@@ -11,10 +11,14 @@
 
 {{ formula }}-software-docker-archive-install:
         {%- if 'deps' in d.pkg and d.pkg.deps %}
-            {%- if grains.os|lower == 'centos' %}
+            {%- if grains.os|lower in ('centos', 'redhat') %}
+                # python-docker package is not available or too old on CentOS, RedHat
                 # https://github.com/saltstack/salt/issues/58920
   pip.installed:
     - name: docker
+    - reload_modules: {{ d.misc.reload or true }}
+    - require:
+      - pkg: {{ formula }}-software-docker-archive-install
             {%- endif %}
   pkg.installed:
     - names: {{ d.pkg.deps|json }}

docker/software/package/install.sls

@@ -17,6 +17,15 @@ include:
             {%- if 'deps' in d.pkg and d.pkg.deps %}
 
 {{ formula }}-software-package-install-deps:
+                {%- if grains.os|lower in ('centos', 'redhat') %}
+                    # python-docker package is not available or too old on CentOS, RedHat
+                    # https://github.com/saltstack/salt/issues/58920
+  pip.installed:
+    - name: docker
+    - reload_modules: {{ d.misc.reload or true }}
+    - require:
+      - pkg: {{ formula }}-software-package-install-deps
+                {%- endif %}
   pkg.installed:
     - names: {{ d.pkg.deps|json }}
     - require_in: