Skip to content

fix(python-docker) install with pip #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
noelmcloughlin merged 1 commit into from
Apr 21, 2021
Merged

fix(python-docker) install with pip #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions docker/compose/ng.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
6 changes: 5 additions & 1 deletion docker/compose/software/binary/install.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 5 additions & 1 deletion docker/software/archive/install.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
9 changes: 9 additions & 0 deletions docker/software/package/install.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down