From 153507d6438d769d851e4dbd5c6e43302b4d5840 Mon Sep 17 00:00:00 2001
From: Jose OrPa <jose.orpa@gmail.com>
Date: Sat, 18 May 2019 13:45:07 +0200
Subject: [PATCH] #3778 Upgrading postgresql to v10

---
 .../roles/kubernetes/templates/postgresql-persistent.yml.j2     | 2 +-
 installer/roles/local_docker/defaults/main.yml                  | 2 +-
 installer/roles/local_docker/templates/docker-compose.yml.j2    | 2 +-
 tools/docker-compose-cluster.yml                                | 2 +-
 tools/docker-compose.yml                                        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/installer/roles/kubernetes/templates/postgresql-persistent.yml.j2 b/installer/roles/kubernetes/templates/postgresql-persistent.yml.j2
index 798152df6989..718479ec8527 100644
--- a/installer/roles/kubernetes/templates/postgresql-persistent.yml.j2
+++ b/installer/roles/kubernetes/templates/postgresql-persistent.yml.j2
@@ -104,7 +104,7 @@ objects:
                 name: ${DATABASE_SERVICE_NAME}
           - name: POSTGRESQL_MAX_CONNECTIONS
             value: ${POSTGRESQL_MAX_CONNECTIONS}
-          image: registry.access.redhat.com/rhscl/postgresql-96-rhel7
+          image: registry.access.redhat.com/rhscl/postgresql-10-rhel7
           imagePullPolicy: IfNotPresent
           livenessProbe:
             initialDelaySeconds: 30
diff --git a/installer/roles/local_docker/defaults/main.yml b/installer/roles/local_docker/defaults/main.yml
index b3c36ed09adf..118c3b198e93 100644
--- a/installer/roles/local_docker/defaults/main.yml
+++ b/installer/roles/local_docker/defaults/main.yml
@@ -10,7 +10,7 @@ rabbitmq_port: "5672"
 rabbitmq_user: "guest"
 rabbitmq_password: "guest"
 
-postgresql_version: "9.6"
+postgresql_version: "10.7"
 postgresql_image: "postgres:{{postgresql_version}}"
 
 memcached_host: "memcached"
diff --git a/installer/roles/local_docker/templates/docker-compose.yml.j2 b/installer/roles/local_docker/templates/docker-compose.yml.j2
index d58d61a1a04d..33c4fda4d0bb 100644
--- a/installer/roles/local_docker/templates/docker-compose.yml.j2
+++ b/installer/roles/local_docker/templates/docker-compose.yml.j2
@@ -128,7 +128,7 @@ services:
 
   {% if pg_hostname is not defined %}
   postgres:
-    image: postgres:9.6
+    image: postgres:10.7
     container_name: awx_postgres
     restart: unless-stopped
     volumes:
diff --git a/tools/docker-compose-cluster.yml b/tools/docker-compose-cluster.yml
index 1001fead4e1d..d9750b575001 100644
--- a/tools/docker-compose-cluster.yml
+++ b/tools/docker-compose-cluster.yml
@@ -90,7 +90,7 @@ services:
       - CLUSTERED=true
       - CLUSTER_WITH=rabbitmq_1
   postgres:
-    image: postgres:9.6
+    image: postgres:10.7
     container_name: tools_postgres_1
   memcached:
     image: memcached:alpine
diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
index e3eca566a913..46aea9227f88 100644
--- a/tools/docker-compose.yml
+++ b/tools/docker-compose.yml
@@ -41,7 +41,7 @@ services:
   #     dockerfile: Dockerfile-logstash
   # Postgres Database Container
   postgres:
-    image: postgres:9.6
+    image: postgres:10.7
     container_name: tools_postgres_1
     ports:
         - "5432:5432"