mirror of
https://github.com/ansible/awx.git
synced 2026-03-17 08:57:33 -02:30
Upgrade to postgres 10.6
- use awx-python in shebang in dev env - scl enable where needed for rhel7 & container installs - use scram-sha-256 pg user hashing by default - ensure psycopg2 is using the correct PG_CONFIG at build time for the right libpq version
This commit is contained in:
committed by
Christian Adams
parent
04ab736f09
commit
ec1e93cc69
@@ -10,7 +10,7 @@ rabbitmq_port: "5672"
|
||||
rabbitmq_user: "guest"
|
||||
rabbitmq_password: "guest"
|
||||
|
||||
postgresql_version: "10.7"
|
||||
postgresql_version: "10"
|
||||
postgresql_image: "postgres:{{postgresql_version}}"
|
||||
|
||||
|
||||
|
||||
@@ -128,15 +128,16 @@ services:
|
||||
|
||||
{% if pg_hostname is not defined %}
|
||||
postgres:
|
||||
image: postgres:10.7
|
||||
image: centos/postgresql-10-centos7
|
||||
container_name: awx_postgres
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- {{ postgres_data_dir }}:/var/lib/postgresql/data:Z
|
||||
environment:
|
||||
POSTGRES_USER: {{ pg_username }}
|
||||
POSTGRES_PASSWORD: {{ pg_password | quote }}
|
||||
POSTGRES_PASSWORD: {{ pg_password }}
|
||||
POSTGRES_DB: {{ pg_database }}
|
||||
POSTGRESQL_ADMIN_PASSWORD: 'postgrespass' # TODO: Remove This
|
||||
PGDATA: /var/lib/postgresql/data/pgdata
|
||||
http_proxy: {{ http_proxy | default('') }}
|
||||
https_proxy: {{ https_proxy | default('') }}
|
||||
|
||||
@@ -2,7 +2,8 @@ DATABASE_USER={{ pg_username }}
|
||||
DATABASE_NAME={{ pg_database }}
|
||||
DATABASE_HOST={{ pg_hostname|default('postgres') }}
|
||||
DATABASE_PORT={{ pg_port|default('5432') }}
|
||||
DATABASE_PASSWORD={{ pg_password | quote }}
|
||||
DATABASE_PASSWORD={{ pg_password|default('awxpass') }}
|
||||
DATABASE_ADMIN_PASSWORD={{ pg_admin_password|default('postgrespass') }}
|
||||
MEMCACHED_HOST={{ memcached_hostname|default('memcached') }}
|
||||
MEMCACHED_PORT={{ memcached_port|default('11211') }}
|
||||
RABBITMQ_HOST={{ rabbitmq_hostname|default('rabbitmq') }}
|
||||
|
||||
Reference in New Issue
Block a user