summaryrefslogtreecommitdiffstats
path: root/installer/roles/local_docker
diff options
context:
space:
mode:
authorsoftwarefactory-project-zuul[bot] <33884098+softwarefactory-project-zuul[bot]@users.noreply.github.com>2019-11-12 16:34:46 +0100
committerGitHub <noreply@github.com>2019-11-12 16:34:46 +0100
commitd3ea09d60cffa7b10c837d6dd2140a985c5ab5ad (patch)
treec5337367045499af2553a40db323567a28447433 /installer/roles/local_docker
parentMerge pull request #5001 from khawaga/kubernetes_ingress_tls (diff)
parentFix postgres docker-compose, add postgresql_image var (diff)
downloadawx-d3ea09d60cffa7b10c837d6dd2140a985c5ab5ad.tar.xz
awx-d3ea09d60cffa7b10c837d6dd2140a985c5ab5ad.zip
Merge pull request #4819 from dgiorgio/devel
Fix docker-compose - Use variables to set docker postgres tag Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
Diffstat (limited to 'installer/roles/local_docker')
-rw-r--r--installer/roles/local_docker/templates/docker-compose.yml.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/installer/roles/local_docker/templates/docker-compose.yml.j2 b/installer/roles/local_docker/templates/docker-compose.yml.j2
index 2e29c52ef6..cf799e3c09 100644
--- a/installer/roles/local_docker/templates/docker-compose.yml.j2
+++ b/installer/roles/local_docker/templates/docker-compose.yml.j2
@@ -135,7 +135,7 @@ services:
{% if pg_hostname is not defined %}
postgres:
- image: postgres:10
+ image: {{ postgresql_image }}
container_name: awx_postgres
restart: unless-stopped
volumes: