Move matrix-bridge-go-skype-bridge to its own container network

group_vars/matrix_servers

@@ -807,17 +807,24 @@ matrix_beeper_linkedin_database_password: "{{ '%s' | format(matrix_homeserver_ge
 # We don't enable bridges by default.
 matrix_go_skype_bridge_enabled: false
 
+matrix_go_skype_bridge_systemd_required_services_list_auto: |
+  {{
+    matrix_addons_homeserver_systemd_services_list
+    +
+    ([devture_postgres_identifier ~ '.service'] if (devture_postgres_enabled and matrix_go_skype_bridge_database_hostname == devture_postgres_connection_hostname) else [])
+  }}
+
 matrix_go_skype_bridge_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}"
 
-matrix_go_skype_bridge_systemd_required_services_list: |
+matrix_go_skype_bridge_container_network: "{{ matrix_addons_container_network }}"
+
+matrix_go_skype_bridge_container_additional_networks_auto: |-
   {{
-    ['docker.service']
-    +
-    ['matrix-' + matrix_homeserver_implementation + '.service']
-    +
-    ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled else [])
-    +
-    (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
+    (
+      ([] if matrix_addons_homeserver_container_network == '' else [matrix_addons_homeserver_container_network])
+      +
+      ([devture_postgres_container_network] if (devture_postgres_enabled and matrix_go_skype_bridge_database_hostname == devture_postgres_connection_hostname and matrix_go_skype_bridge_container_network != devture_postgres_container_network) else [])
+    ) | unique
   }}
 
 matrix_go_skype_bridge_appservice_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'skype.as.token', rounds=655555) | to_uuid }}"

roles/custom/matrix-bridge-go-skype-bridge/defaults/main.yml

@@ -23,11 +23,20 @@ matrix_go_skype_bridge_homeserver_address: "{{ matrix_homeserver_container_url }
 matrix_go_skype_bridge_homeserver_domain: "{{ matrix_domain }}"
 matrix_go_skype_bridge_appservice_address: 'http://matrix-go-skype-bridge:8080'
 
+matrix_go_skype_bridge_container_network: ""
+
+matrix_go_skype_bridge_container_additional_networks: "{{ matrix_go_skype_bridge_container_additional_networks_auto + matrix_go_skype_bridge_container_additional_networks_custom }}"
+matrix_go_skype_bridge_container_additional_networks_auto: []
+matrix_go_skype_bridge_container_additional_networks_custom: []
+
 # A list of extra arguments to pass to the container
 matrix_go_skype_bridge_container_extra_arguments: []
 
 # List of systemd services that matrix-go-skype-bridge.service depends on.
-matrix_go_skype_bridge_systemd_required_services_list: ['docker.service']
+matrix_go_skype_bridge_systemd_required_services_list: "{{ matrix_go_skype_bridge_systemd_required_services_list_default + matrix_go_skype_bridge_systemd_required_services_list_auto + matrix_go_skype_bridge_systemd_required_services_list_custom }}"
+matrix_go_skype_bridge_systemd_required_services_list_default: ['docker.service']
+matrix_go_skype_bridge_systemd_required_services_list_auto: []
+matrix_go_skype_bridge_systemd_required_services_list_custom: []
 
 # List of systemd services that matrix-go-skype-bridge.service wants
 matrix_go_skype_bridge_systemd_wanted_services_list: []

roles/custom/matrix-bridge-go-skype-bridge/tasks/setup_install.yml

@@ -126,6 +126,11 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
 
+- name: Ensure matrix-go-skype-bridge container network is created
+  community.general.docker_network:
+    name: "{{ matrix_go_skype_bridge_container_network }}"
+    driver: bridge
+
 - name: Ensure matrix-go-skype-bridge.service installed
   ansible.builtin.template:
     src: "{{ role_path }}/templates/systemd/matrix-go-skype-bridge.service.j2"

roles/custom/matrix-bridge-go-skype-bridge/tasks/validate_config.yml

@@ -9,3 +9,4 @@
     - {'name': 'matrix_go_skype_bridge_appservice_token', when: true}
     - {'name': 'matrix_go_skype_bridge_homeserver_token', when: true}
     - {'name': 'matrix_go_skype_bridge_database_hostname', when: "{{ matrix_go_skype_bridge_database_engine == 'postgres' }}"}
+    - {'name': 'matrix_go_skype_bridge_container_network', when: true}

roles/custom/matrix-bridge-go-skype-bridge/templates/systemd/matrix-go-skype-bridge.service.j2

@@ -19,13 +19,15 @@ ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_s
 # Intentional delay, so that the homeserver (we likely depend on) can manage to start.
 ExecStartPre={{ matrix_host_command_sleep }} 5
 
-ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name matrix-go-skype-bridge \
+ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
+			--rm \
+			--name=matrix-go-skype-bridge \
 			--log-driver=none \
 			--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
 			--cap-drop=ALL \
-			--network={{ matrix_docker_network }} \
-			-v {{ matrix_go_skype_bridge_config_path }}:/config:z \
-			-v {{ matrix_go_skype_bridge_data_path }}:/data:z \
+			--network={{ matrix_go_skype_bridge_container_network }} \
+			--mount type=bind,src={{ matrix_go_skype_bridge_config_path }},dst=/config \
+			--mount type=bind,src={{ matrix_go_skype_bridge_data_path }},dst=/data \
 			--workdir=/data \
 			{% for arg in matrix_go_skype_bridge_container_extra_arguments %}
 			{{ arg }} \
@@ -33,6 +35,12 @@ ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name
 			{{ matrix_go_skype_bridge_docker_image }} \
 			/usr/bin/matrix-skype -c /config/config.yaml -r /config/registration.yaml
 
+{% for network in matrix_go_skype_bridge_container_additional_networks %}
+ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-go-skype-bridge
+{% endfor %}
+
+ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-go-skype-bridge
+
 ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-go-skype-bridge 2>/dev/null || true'
 ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-go-skype-bridge 2>/dev/null || true'
 Restart=always