Skip to content

Commit 6c0714d

Browse files
Merge pull request #4 from punktDe/debian-support
Debian support
2 parents 23378b0 + 26fa8b2 commit 6c0714d

2 files changed

Lines changed: 18 additions & 6 deletions

File tree

tasks/install.yaml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,21 @@
6262
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('22.04', '>=')
6363

6464
- name: Install python modules
65-
ansible.builtin.pip:
66-
name:
67-
- requests
68-
- 'urllib3<2'
69-
- docker
70-
65+
block:
66+
- name: Install python modules (pip)
67+
ansible.builtin.pip:
68+
name:
69+
- requests
70+
- 'urllib3<2'
71+
- docker
72+
rescue:
73+
- name: Install python modules (apt)
74+
ansible.builtin.apt:
75+
update_cache: yes
76+
name:
77+
- python3-requests
78+
- python3-urllib3
79+
- python3-docker
7180

7281
- name: Enable and start Docker
7382
ansible.builtin.systemd:

templates/systemd/container.service

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ ExecStartPre=docker create --name={{ container.container_name }} --rm \
5656
{%- if container.entrypoint|default(none) %}
5757
--entrypoint={{ container.entrypoint|quote }} \
5858
{%- endif %}
59+
{%- for dependency in container.depends_on | default([]) %}
60+
Wants={{ dependency }}.service
61+
{%- endfor %}
5962
{{ container.image|quote }}{{ '' if not container.command|default(none) or container.command.items()|rejectattr('1', 'eq', none)|first|default(none) is none else ' \\' }}
6063
{%- for _, argument in (container.command.items()|rejectattr('1', 'eq', none) if container.command|default(none) else []) %}
6164
{{ argument|quote }}{% if not loop.last %} \{%- endif %}

0 commit comments

Comments
 (0)