From 12f564e4a39f67480d64c5685758f25d15c14d42 Mon Sep 17 00:00:00 2001 From: "Scholl III, Michael G" Date: Thu, 11 Jul 2019 11:15:09 -0400 Subject: [PATCH] Addition of inventory value for memcached image, allows for custom image locations for memcached to match other images --- installer/roles/local_docker/defaults/main.yml | 3 +++ installer/roles/local_docker/templates/docker-compose.yml.j2 | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/installer/roles/local_docker/defaults/main.yml b/installer/roles/local_docker/defaults/main.yml index b3c36ed09a..7b9ad58c8e 100644 --- a/installer/roles/local_docker/defaults/main.yml +++ b/installer/roles/local_docker/defaults/main.yml @@ -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" diff --git a/installer/roles/local_docker/templates/docker-compose.yml.j2 b/installer/roles/local_docker/templates/docker-compose.yml.j2 index d58d61a1a0..8c0e162081 100644 --- a/installer/roles/local_docker/templates/docker-compose.yml.j2 +++ b/installer/roles/local_docker/templates/docker-compose.yml.j2 @@ -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: