diff --git a/docker/compose/ng.sls b/docker/compose/ng.sls index 6bc7506e..8e176033 100644 --- a/docker/compose/ng.sls +++ b/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 %} diff --git a/docker/compose/software/binary/install.sls b/docker/compose/software/binary/install.sls index e51957ef..bf0eddda 100644 --- a/docker/compose/software/binary/install.sls +++ b/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 }} diff --git a/docker/software/archive/install.sls b/docker/software/archive/install.sls index 753c52eb..55b7ac15 100644 --- a/docker/software/archive/install.sls +++ b/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 }} diff --git a/docker/software/package/install.sls b/docker/software/package/install.sls index 142e5600..6e232a7f 100644 --- a/docker/software/package/install.sls +++ b/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: