diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 941a252c68db..a9d6bfaf85ae 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -155,7 +155,7 @@ If you start a second terminal session, you can take a look at the running conta
$ docker ps
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
aa4a75d6d77b gcr.io/ansible-tower-engineering/awx_devel:devel "/tini -- /bin/sh ..." 23 seconds ago Up 15 seconds 0.0.0.0:5555->5555/tcp, 0.0.0.0:6899-6999->6899-6999/tcp, 0.0.0.0:8013->8013/tcp, 0.0.0.0:8043->8043/tcp, 22/tcp, 0.0.0.0:8080->8080/tcp tools_awx_1
-e4c0afeb548c postgres:9.6 "docker-entrypoint..." 26 seconds ago Up 23 seconds 5432/tcp tools_postgres_1
+e4c0afeb548c postgres:10.6 "docker-entrypoint..." 26 seconds ago Up 23 seconds 5432/tcp tools_postgres_1
0089699d5afd tools_logstash "/docker-entrypoin..." 26 seconds ago Up 25 seconds tools_logstash_1
4d4ff0ced266 memcached:alpine "docker-entrypoint..." 26 seconds ago Up 25 seconds 0.0.0.0:11211->11211/tcp tools_memcached_1
92842acd64cd rabbitmq:3-management "docker-entrypoint..." 26 seconds ago Up 24 seconds 4369/tcp, 5671-5672/tcp, 15671/tcp, 25672/tcp, 0.0.0.0:15672->15672/tcp tools_rabbitmq_1
diff --git a/Makefile b/Makefile
index 495549741c27..5ac8e24020b9 100644
--- a/Makefile
+++ b/Makefile
@@ -647,7 +647,7 @@ clean-elk:
docker rm tools_kibana_1
psql-container:
- docker run -it --net tools_default --rm postgres:9.6 sh -c 'exec psql -h "postgres" -p "5432" -U postgres'
+ docker run -it --net tools_default --rm postgres:10.6 sh -c 'exec psql -h "postgres" -p "5432" -U postgres'
VERSION:
@echo "awx: $(VERSION)"
diff --git a/docs/licenses/psycopg2-2.7.3.2.tar.gz b/docs/licenses/psycopg2-2.7.3.2.tar.gz
deleted file mode 100644
index 387fcb469aa8..000000000000
Binary files a/docs/licenses/psycopg2-2.7.3.2.tar.gz and /dev/null differ
diff --git a/docs/licenses/psycopg2-2.8.2.tar.gz b/docs/licenses/psycopg2-2.8.2.tar.gz
new file mode 100644
index 000000000000..52dcabea1e61
Binary files /dev/null and b/docs/licenses/psycopg2-2.8.2.tar.gz differ
diff --git a/docs/licenses/psycopg2.txt b/docs/licenses/psycopg2.txt
index 360a44f6b4c7..fdae2e416a66 100644
--- a/docs/licenses/psycopg2.txt
+++ b/docs/licenses/psycopg2.txt
@@ -1,5 +1,5 @@
psycopg2 and the LGPL
-=====================
+---------------------
psycopg2 is free software: you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -25,19 +25,14 @@ statement from all source files in the program, then also delete it here.
You should have received a copy of the GNU Lesser General Public License
along with psycopg2 (see the doc/ directory.)
-If not, see .
+If not, see .
Alternative licenses
-====================
+--------------------
-If you prefer you can use the Zope Database Adapter ZPsycopgDA (i.e.,
-every file inside the ZPsycopgDA directory) user the ZPL license as
-published on the Zope web site, http://www.zope.org/Resources/ZPL.
-
-Also, the following BSD-like license applies (at your option) to the
-files following the pattern psycopg/adapter*.{h,c} and
-psycopg/microprotocol*.{h,c}:
+The following BSD-like license applies (at your option) to the files following
+the pattern ``psycopg/adapter*.{h,c}`` and ``psycopg/microprotocol*.{h,c}``:
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
@@ -52,3 +47,4 @@ psycopg/microprotocol*.{h,c}:
be misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
+
\ No newline at end of file
diff --git a/installer/roles/kubernetes/tasks/main.yml b/installer/roles/kubernetes/tasks/main.yml
index 31eb4efcda8e..fd189011e0b0 100644
--- a/installer/roles/kubernetes/tasks/main.yml
+++ b/installer/roles/kubernetes/tasks/main.yml
@@ -69,7 +69,7 @@
-e POSTGRESQL_PASSWORD={{ pg_password | quote }} \
-e POSTGRESQL_ADMIN_PASSWORD={{ pg_password | quote }} \
-e POSTGRESQL_DATABASE={{ pg_database }} \
- -e POSTGRESQL_VERSION=9.6 \
+ -e POSTGRESQL_VERSION=10.6 \
-n {{ kubernetes_namespace }}
register: openshift_pg_activate
no_log: yes
diff --git a/installer/roles/kubernetes/templates/postgresql-persistent.yml.j2 b/installer/roles/kubernetes/templates/postgresql-persistent.yml.j2
index 718479ec8527..3bc82ae6f356 100644
--- a/installer/roles/kubernetes/templates/postgresql-persistent.yml.j2
+++ b/installer/roles/kubernetes/templates/postgresql-persistent.yml.j2
@@ -10,11 +10,11 @@ message: |-
Database Name: ${POSTGRESQL_DATABASE}
Connection URL: postgresql://${DATABASE_SERVICE_NAME}:5432/
- For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/9.5.
+ For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/.
metadata:
annotations:
description: |-
- PostgreSQL database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/9.5.
+ PostgreSQL database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/.
NOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.
iconClass: icon-postgresql
diff --git a/installer/roles/local_docker/defaults/main.yml b/installer/roles/local_docker/defaults/main.yml
index 118c3b198e93..a17331fe6772 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: "10.7"
+postgresql_version: "10.6"
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 33c4fda4d0bb..9388607c2301 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:10.7
+ image: postgres:10.6
container_name: awx_postgres
restart: unless-stopped
volumes:
diff --git a/requirements/requirements.in b/requirements/requirements.in
index 5adae509d001..a7afb66639c0 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -29,7 +29,7 @@ Markdown==2.6.11 # used for formatting API help
ordereddict==1.1
prometheus_client==0.6.0
psutil==5.4.3
-psycopg2==2.7.3.2 # problems with Segmentation faults / wheels on upgrade
+psycopg2==2.8.2
pygerduty==0.37.0
pyparsing==2.2.0
python-dateutil==2.7.2 # contains support for TZINFO= parsing
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 24ae822d0fec..dbb21f9206cd 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -72,7 +72,7 @@ pexpect==4.6.0 # via ansible-runner
pkgconfig==1.5.1 # via xmlsec
prometheus_client==0.6.0
psutil==5.4.3
-psycopg2==2.7.3.2
+psycopg2==2.8.2
ptyprocess==0.6.0 # via pexpect
pyasn1-modules==0.2.5 # via python-ldap, service-identity
pyasn1==0.4.5 # via pyasn1-modules, python-ldap, service-identity
diff --git a/tools/clusterdevel/roles/minishift/templates/hostdev.yml.j2 b/tools/clusterdevel/roles/minishift/templates/hostdev.yml.j2
index 3c7c0e24ec03..fb2dce09e861 100644
--- a/tools/clusterdevel/roles/minishift/templates/hostdev.yml.j2
+++ b/tools/clusterdevel/roles/minishift/templates/hostdev.yml.j2
@@ -64,7 +64,7 @@ spec:
- name: awx-memcached
image: memcached
- name: postgres
- image: postgres:9.6
+ image: postgres:10.6
volumes:
- name: localdev
persistentVolumeClaim:
diff --git a/tools/docker-compose-cluster.yml b/tools/docker-compose-cluster.yml
index d9750b575001..c1a92d0378b9 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:10.7
+ image: postgres:10.6
container_name: tools_postgres_1
memcached:
image: memcached:alpine
diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
index 46aea9227f88..ca7ac656103b 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:10.7
+ image: postgres:10.6
container_name: tools_postgres_1
ports:
- "5432:5432"