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

Merge pull request #4314 from mgs4332/memcached_image

Browse Source 
Addition of inventory value for memcached image, allows for custom im…

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-07-18 16:20:37 +00:00 committed by GitHub
commit a128a94842
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats 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_image: "postgres:{{postgresql_version}}"
memcached_image: "memcached"
memcached_version: "alpine"
memcached_host: "memcached"
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('') }}
memcached:
image: memcached:alpine
image: "{{ memcached_image }}:{{ memcached_version }}"
container_name: awx_memcached
restart: unless-stopped
environment: