service: Split container network namespaces
This commit is contained in:
@@ -10,7 +10,7 @@
|
|||||||
container_user: "{{ service_container_user }}"
|
container_user: "{{ service_container_user }}"
|
||||||
container_mounts: "{{ _service_additional_container_mounts }}"
|
container_mounts: "{{ _service_additional_container_mounts }}"
|
||||||
container_publish_ports: "{{ _service_additional_container_publish_ports }}"
|
container_publish_ports: "{{ _service_additional_container_publish_ports }}"
|
||||||
container_networks: "{{ _service_container_networks }}"
|
container_networks: "{{ _service_additional_container_networks }}"
|
||||||
container_ip: "{{ _service_additional_container_ip }}"
|
container_ip: "{{ _service_additional_container_ip }}"
|
||||||
container_secrets: "{{ _service_additional_container.secrets | default(_service_container_secrets) }}"
|
container_secrets: "{{ _service_additional_container.secrets | default(_service_container_secrets) }}"
|
||||||
container_hostname: "{{ _service_additional_container.name | regex_replace('^' ~ service_name ~ '-', '') }}"
|
container_hostname: "{{ _service_additional_container.name | regex_replace('^' ~ service_name ~ '-', '') }}"
|
||||||
|
|||||||
@@ -11,6 +11,19 @@ _service_additional_containers: >-
|
|||||||
| map('combine')
|
| map('combine')
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
_service_additional_container_networks: >-
|
||||||
|
{{
|
||||||
|
[service_name]
|
||||||
|
+ [_service_additional_container.name]
|
||||||
|
+ service_container_additional_networks
|
||||||
|
+ (
|
||||||
|
_service_additional_container_publish_socket_ports
|
||||||
|
| map(attribute='name')
|
||||||
|
| map('regex_replace', '^', service_name ~ '-')
|
||||||
|
| map('regex_replace', '$', '-socat')
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
|
||||||
_service_additional_container_ip: >-
|
_service_additional_container_ip: >-
|
||||||
{{
|
{{
|
||||||
service_container_ip |
|
service_container_ip |
|
||||||
|
|||||||
@@ -1,5 +1,12 @@
|
|||||||
---
|
---
|
||||||
_service_container_networks: "{{ [service_name] + service_container_additional_networks }}"
|
_service_container_networks: >-
|
||||||
|
{{
|
||||||
|
[service_name]
|
||||||
|
+ service_container_additional_networks
|
||||||
|
+ ([service_name ~ '-socat'] if service_container_http_port > 0 else [])
|
||||||
|
+ (_service_container_publish_socket_ports | map(attribute='name') | map('regex_replace', '^', service_name ~ '-'))
|
||||||
|
+ (_service_additional_containers | map(attribute='name'))
|
||||||
|
}}
|
||||||
_service_static_ip: "{{ service_container_ip | length > 0 }}"
|
_service_static_ip: "{{ service_container_ip | length > 0 }}"
|
||||||
|
|
||||||
_service_container_requires: >-
|
_service_container_requires: >-
|
||||||
|
|||||||
Reference in New Issue
Block a user