diff options
| author | Christian M. Adams <rooftopcellist@gmail.com> | 2020-12-15 21:03:18 +0100 |
|---|---|---|
| committer | Christian M. Adams <rooftopcellist@gmail.com> | 2021-01-08 16:54:00 +0100 |
| commit | 36466b96944fbd264c56d674b39c615b1111b7d7 (patch) | |
| tree | 626c6654f91b800b2188505404d221b2e8f07474 /tools | |
| parent | Merge pull request #8880 from vguillard/issue_5080_openstack_region_field_mis... (diff) | |
| download | awx-36466b96944fbd264c56d674b39c615b1111b7d7.tar.xz awx-36466b96944fbd264c56d674b39c615b1111b7d7.zip | |
Upgrade PostgreSQL from 10 to 12
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker-compose-cluster.yml | 2 | ||||
| -rw-r--r-- | tools/docker-compose.yml | 2 | ||||
| -rwxr-xr-x | tools/scripts/awx-python | 8 |
3 files changed, 2 insertions, 10 deletions
diff --git a/tools/docker-compose-cluster.yml b/tools/docker-compose-cluster.yml index 7aec34d8e4..8532b6e942 100644 --- a/tools/docker-compose-cluster.yml +++ b/tools/docker-compose-cluster.yml @@ -96,5 +96,5 @@ services: - "./redis/redis.conf:/usr/local/etc/redis/redis.conf" - "./redis/redis_socket_ha_3:/var/run/redis/" postgres: - image: postgres:10 + image: postgres:12 container_name: tools_postgres_1 diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml index 19ead50661..27261cd1e6 100644 --- a/tools/docker-compose.yml +++ b/tools/docker-compose.yml @@ -44,7 +44,7 @@ services: # Postgres Database Container postgres: - image: postgres:10 + image: postgres:12 container_name: tools_postgres_1 environment: POSTGRES_HOST_AUTH_METHOD: trust diff --git a/tools/scripts/awx-python b/tools/scripts/awx-python index 00d5e7363e..7b64af02e3 100755 --- a/tools/scripts/awx-python +++ b/tools/scripts/awx-python @@ -1,12 +1,4 @@ #!/usr/bin/env bash -# Enable needed Software Collections, if installed -for scl in rh-postgresql10; do - if [ -f /etc/scl/prefixes/$scl ]; then - if [ -f `cat /etc/scl/prefixes/$scl`/$scl/enable ]; then - . `cat /etc/scl/prefixes/$scl`/$scl/enable - fi - fi -done # Enable Tower virtualenv for venv_path in /var/lib/awx/venv/awx; do |