Skip to content

Commit 7793004

Browse files
committed
docker: simplify systemd dependencies by allowing host to container bind mount propagation instead
1 parent 090c04f commit 7793004

File tree

5 files changed

+1
-30
lines changed

5 files changed

+1
-30
lines changed

inventories/group_vars/all.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ docker_volumes_downloads_common: "{{ docker_volumes_downloads_nzbs + docker_volu
376376
else [downloads_root_path + ':/downloads'] }}"
377377

378378
docker_volumes_common_folders:
379-
- "/mnt:/mnt"
379+
- "/mnt:/mnt:rslave"
380380

381381
docker_volumes_common: "{{ docker_volumes_common_folders + docker_volumes_downloads_common
382382
if (lookup('vars', traefik_role_var + '_docker_volumes_download', default=true) | bool)

roles/docker/tasks/main.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,6 @@
3434
docker_controller_service_running: "{{ (services['saltbox_managed_docker_controller.service'] is defined) and (services['saltbox_managed_docker_controller.service']['state'] == 'running') }}"
3535
when: docker_binary.stat.exists
3636

37-
- name: Initialize '_remotes_services_list' variable
38-
ansible.builtin.set_fact:
39-
_remotes_services_list: ""
40-
41-
- name: Set '_remotes_services_list' variable
42-
ansible.builtin.set_fact:
43-
_remotes_services_list: "{{ _remotes_services_list | default('') + (rclone_service_template + rclone_remote_name + '.service ') }}"
44-
with_items: "{{ rclone.remotes }}"
45-
when: rclone_remote_is_defined and use_remote and item.settings.template != "nfs" and item.settings.mount
46-
4737
- name: Tasks for when Docker exists and is running
4838
when: docker_service_check
4939
block:

roles/docker/templates/override.conf.j2

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,7 @@
99
#########################################################################
1010

1111
[Unit]
12-
{% if rclone_remote_is_defined and use_remote and not continuous_integration %}
13-
After={{ _remotes_services_list | default('') }}{{ docker_service_after }}
14-
Requires={{ _remotes_services_list | default('') }}{{ docker_service_after }}
15-
{% else %}
1612
After={{ docker_service_after }}
17-
Requires={{ docker_service_after }}
18-
{% endif %}
1913
Wants=saltbox_managed_docker_controller_helper.service saltbox_managed_docker_update_hosts.service
2014

2115
[Service]

roles/unionfs/tasks/subtasks/docker/daemon.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@
77
# GNU General Public License v3.0 #
88
#########################################################################
99
---
10-
- name: "Docker | Daemon | Initialize '_remotes_services_list' variable"
11-
ansible.builtin.set_fact:
12-
_remotes_services_list: ""
13-
14-
- name: "Docker | Daemon | Set '_remotes_services_list' variable"
15-
ansible.builtin.set_fact:
16-
_remotes_services_list: "{{ _remotes_services_list | default('') + (rclone_service_template + rclone_remote_name + '.service ') }}"
17-
with_items: "{{ rclone.remotes }}"
18-
when: rclone_remote_is_defined and use_remote and item.settings.template != "nfs" and item.settings.mount
19-
2010
- name: "Docker | Daemon | Create override directory"
2111
ansible.builtin.file:
2212
path: "/etc/systemd/system/docker.service.d"

roles/unionfs/tasks/subtasks/variables.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
# GNU General Public License v3.0 #
88
##########################################################################
99
---
10-
################################
11-
# Remotes List
12-
################################
1310
- name: Variables | Set '_remotes_list' variable
1411
ansible.builtin.set_fact:
1512
_remotes_list: "{{ _remotes_list | default('') + '/mnt/remote/' + (item.remote.split(':')[0] if ':' in item.remote else item.remote) + '=' + mergerfs_remote_branch_mode_lookup + ':' }}"

0 commit comments

Comments
 (0)