forked from uumas/ansible-docker
support more modular container reverse proxy config and host networking
This commit is contained in:
@@ -3,11 +3,18 @@
|
||||
- name: "{{ docker_service }} docker network"
|
||||
docker_network:
|
||||
name: "{{ docker_service }}"
|
||||
when: docker_network_mode is not defined or docker_network_mode != 'host'
|
||||
|
||||
- name: Set published ports variable
|
||||
set_fact:
|
||||
container_published_ports: ["127.0.0.1:{{ ports[docker_service].http }}:{{ docker_image_http_port }}"]
|
||||
when: reverse_proxy_type != 'traefik' and docker_network_mode is defined and docker_network_mode != 'host'
|
||||
container_published_ports: ["127.0.0.1:{{ ports[docker_service][proxy_target_protocol] }}:{{ docker_image_http_port }}"]
|
||||
when: reverse_proxy_type != 'traefik' and (docker_network_mode is not defined or docker_network_mode != 'host')
|
||||
|
||||
- name: Set networks variable
|
||||
set_fact:
|
||||
container_networks:
|
||||
- name: "{{ docker_service }}"
|
||||
when: docker_network_mode is not defined or docker_network_mode != 'host'
|
||||
|
||||
- name: Include traefik vars
|
||||
include_vars: traefik.yml
|
||||
@@ -21,7 +28,7 @@
|
||||
POSTGRES_PASSWORD: "{{ database_passwords[docker_service] }}"
|
||||
db_container_data: /var/lib/postgresql/data
|
||||
when: docker_database is defined and docker_database == 'postgres'
|
||||
- name: Set postgres container env
|
||||
- name: Set mongo container env
|
||||
set_fact:
|
||||
db_container_image: 'mongo:latest'
|
||||
db_container_data: /data/db
|
||||
@@ -37,8 +44,7 @@
|
||||
restart_policy: always
|
||||
volumes:
|
||||
- "{{ docker_service }}_db:{{ db_container_data }}"
|
||||
networks:
|
||||
- name: "{{ docker_service }}"
|
||||
networks: "{{ container_networks | default(omit) }}"
|
||||
when: docker_database is defined
|
||||
|
||||
- name: "Container for {{ docker_service }}"
|
||||
@@ -48,13 +54,12 @@
|
||||
pull: true
|
||||
container_default_behavior: no_defaults
|
||||
volumes: "{{ docker_volumes | default(omit) }}"
|
||||
published_ports: "{{ container_published_ports + docker_published_ports | default(omit) }}"
|
||||
published_ports: "{{ container_published_ports | default([]) + docker_published_ports | default(omit) }}"
|
||||
labels: "{{ traefik_labels | default(omit) }}"
|
||||
env: "{{ docker_env | combine(docker_additional_env) }}"
|
||||
entrypoint: "{{ docker_entrypoint | default(omit) }}"
|
||||
restart_policy: always
|
||||
network_mode: "{{ docker_network_mode | default(omit) }}"
|
||||
networks:
|
||||
- name: "{{ docker_service }}"
|
||||
networks: "{{ container_networks | default(omit) }}"
|
||||
register: container_out
|
||||
|
||||
|
||||
Reference in New Issue
Block a user