External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 11:57:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Addition of inventory value for memcached image, allows for custom image locations for memcached to match other images

Browse Source
This commit is contained in:
Scholl III, Michael G
2019-07-11 11:15:09 -04:00
committed by Ryan Petrello
parent 41b0367627
commit 12f564e4a3
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
installer/roles/local_docker/defaults/main.yml
View File

@@ -13,6 +13,9 @@ rabbitmq_password: "guest"
postgresql_version: "9.6" postgresql_version: "9.6"
postgresql_image: "postgres:{{postgresql_version}}" postgresql_image: "postgres:{{postgresql_version}}"
memcached_image: "memcached"
memcached_version: "alpine"
memcached_host: "memcached" memcached_host: "memcached"
memcached_port: "11211" memcached_port: "11211"

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

@@ -118,7 +118,7 @@ services:
no_proxy: {{ no_proxy | default('') }} no_proxy: {{ no_proxy | default('') }}
memcached: memcached:
image: memcached:alpine image: "{{ memcached_image }}:{{ memcached_version }}"
container_name: awx_memcached container_name: awx_memcached
restart: unless-stopped restart: unless-stopped
environment: environment: