External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-25 15:06:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7185 from mstrent/devel

Browse Source 
Add subnet configuration to Docker Compose to avoid conflicts.

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-05-29 17:10:29 +00:00
committed by GitHub
parent d205685541 8d6d5eeed8
commit 80e22ff2ce
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
installer/inventory
View File

@@ -154,3 +154,6 @@ secret_key=awxsecret
# which makes include "optional" - i.e. not fail # which makes include "optional" - i.e. not fail
# if file is absent # if file is absent
#extra_nginx_include="/etc/nginx/awx_extra[.]conf" #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"

11
installer/roles/local_docker/templates/docker-compose.yml.j2
View File

@@ -171,6 +171,17 @@ services:
https_proxy: {{ https_proxy | default('') }} https_proxy: {{ https_proxy | default('') }}
no_proxy: {{ no_proxy | default('') }} no_proxy: {{ no_proxy | default('') }}
{% endif %} {% endif %}
{% if docker_compose_subnet is defined %}
networks:
default:
driver: bridge
ipam:
driver: default
config:
- subnet: {{ docker_compose_subnet }}
{% endif %}
volumes: volumes:
supervisor-socket: supervisor-socket:
rsyslog-socket: rsyslog-socket: