From 8d6d5eeed8ff849ce18107d5729d985bc2a5b4e8 Mon Sep 17 00:00:00 2001 From: mstrent Date: Thu, 28 May 2020 09:17:45 -0700 Subject: [PATCH] Add subnet configuratin to Docker Compose to avoid conflicts. The out of the box subnet Docker Compose selects may conflict with your existing LAN subnets. This makes it configurable. --- installer/inventory | 3 +++ .../local_docker/templates/docker-compose.yml.j2 | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/installer/inventory b/installer/inventory index 4b644ba21d..e581001cbc 100644 --- a/installer/inventory +++ b/installer/inventory @@ -154,3 +154,6 @@ secret_key=awxsecret # which makes include "optional" - i.e. not fail # if file is absent #extra_nginx_include="/etc/nginx/awx_extra[.]conf" + +# Docker compose explicit subnet. Set to avoid overlapping your existing LAN networks. +#docker_compose_subnet="172.17.0.1/16" diff --git a/installer/roles/local_docker/templates/docker-compose.yml.j2 b/installer/roles/local_docker/templates/docker-compose.yml.j2 index 66ada06aba..7ecdcf2dad 100644 --- a/installer/roles/local_docker/templates/docker-compose.yml.j2 +++ b/installer/roles/local_docker/templates/docker-compose.yml.j2 @@ -171,6 +171,17 @@ services: https_proxy: {{ https_proxy | default('') }} no_proxy: {{ no_proxy | default('') }} {% endif %} + +{% if docker_compose_subnet is defined %} +networks: + default: + driver: bridge + ipam: + driver: default + config: + - subnet: {{ docker_compose_subnet }} +{% endif %} + volumes: supervisor-socket: rsyslog-socket: