container: Allow custom ip addresses for more than one network
This commit is contained in:
@@ -12,7 +12,6 @@
|
||||
container_devices: "{{ _service_additional_container.devices | default(service_container_devices) }}"
|
||||
container_publish_ports: "{{ _service_additional_container_publish_ports }}"
|
||||
container_networks: "{{ _service_additional_container_networks }}"
|
||||
container_ip: "{{ _service_additional_container_ip }}"
|
||||
container_hostname: "{{ _service_additional_container.name | regex_replace('^' ~ service_name ~ '-', '') }}"
|
||||
container_secrets: "{{ _service_additional_container_secrets }}"
|
||||
container_env: "{{ _service_additional_container.env | default(service_container_env) }}"
|
||||
|
||||
@@ -15,8 +15,6 @@
|
||||
destination: "{{ _service_database_mount_destination }}"
|
||||
container_networks: "{{ _service_database_networks }}"
|
||||
container_hostname: "{{ service_database_type }}"
|
||||
container_ip: >-
|
||||
{{ service_container_ip | ansible.utils.ipmath(1) if _service_static_ip else '' }}
|
||||
container_secrets: "{{ _service_database_secrets }}"
|
||||
container_env: "{{ _service_database_env }}"
|
||||
container_auto_update: "{{ service_auto_update }}"
|
||||
|
||||
@@ -44,7 +44,6 @@
|
||||
container_devices: "{{ service_container_devices }}"
|
||||
container_publish_ports: "{{ _service_container_publish_ports }}"
|
||||
container_networks: "{{ _service_container_networks }}"
|
||||
container_ip: "{{ service_container_ip }}"
|
||||
container_secrets: "{{ _service_container_secrets }}"
|
||||
container_env: "{{ service_container_env }}"
|
||||
container_add_capabilities: "{{ service_container_add_capabilities }}"
|
||||
@@ -60,7 +59,7 @@
|
||||
socat_service_name: "{{ service_name }}"
|
||||
socat_target_http_port: "{{ service_container_http_port }}"
|
||||
socat_container_ip: >-
|
||||
{{ service_container_ip | ansible.utils.ipmath(3) if _service_static_ip else '' }}
|
||||
{{ service_container_ip | ansible.utils.ipmath(257) if _service_static_ip else '' }}
|
||||
socat_auto_update: "{{ service_auto_update }}"
|
||||
|
||||
- name: Socat for socket published ports of {{ service_name }}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
- --cookie-secret-file
|
||||
- /run/secrets/cookie-secret
|
||||
container_networks:
|
||||
- "{{ service_name }}-oauth2-proxy"
|
||||
- name: "{{ service_name }}-oauth2-proxy"
|
||||
container_secrets:
|
||||
- name: "{{ service_name }}-oauth2-proxy-cookie-secret"
|
||||
length: 32
|
||||
|
||||
@@ -6,8 +6,7 @@
|
||||
container_name: "{{ service_name }}-redis"
|
||||
container_image: docker.io/valkey/valkey:alpine
|
||||
container_networks:
|
||||
- "{{ service_name }}"
|
||||
- name: "{{ service_name }}"
|
||||
ip: "{{ service_container_ip | ansible.utils.ipmath(2) if _service_static_ip else '' }}"
|
||||
container_hostname: redis
|
||||
container_ip: >-
|
||||
{{ service_container_ip | ansible.utils.ipmath(2) if _service_static_ip else '' }}
|
||||
container_auto_update: "{{ service_auto_update }}"
|
||||
|
||||
Reference in New Issue
Block a user