mirror of
https://github.com/ansible/awx.git
synced 2026-05-20 07:17:40 -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
@@ -5,7 +5,12 @@ USER root
|
||||
ADD ansible.repo /etc/yum.repos.d/ansible.repo
|
||||
ADD RPM-GPG-KEY-ansible-release /etc/pki/rpm-gpg/RPM-GPG-KEY-ansible-release
|
||||
|
||||
RUN yum -y update && yum -y install epel-release && yum -y install https://centos7.iuscommunity.org/ius-release.rpm
|
||||
|
||||
# add rhscl repo for rh-postgresql-devel
|
||||
RUN yum -y install centos-release-scl
|
||||
RUN yum-config-manager --enable rhel-server-rhscl-7-rpms
|
||||
|
||||
RUN yum -y update && yum -y install epel-release && yum -y install https://centos7.iuscommunity.org/ius-release.rpm
|
||||
|
||||
# sync with tools/docker-compose/Dockerfile
|
||||
RUN yum -y install acl \
|
||||
@@ -35,7 +40,10 @@ RUN yum -y install acl \
|
||||
nodejs \
|
||||
openldap-devel \
|
||||
openssh-server \
|
||||
postgresql-devel \
|
||||
rh-postgresql10-postgresql-devel \
|
||||
rh-postgresql10-postgresql-server-syspaths \
|
||||
scl-utils-build \
|
||||
scl-utils \
|
||||
python-devel \
|
||||
python-pip \
|
||||
python-psutil \
|
||||
@@ -63,6 +71,8 @@ RUN chmod +x /tini
|
||||
RUN python3 -m ensurepip && pip3 install virtualenv
|
||||
RUN pip install supervisor
|
||||
|
||||
RUN find / -name pg_config
|
||||
|
||||
ADD Makefile /tmp/Makefile
|
||||
RUN mkdir /tmp/requirements
|
||||
ADD requirements/requirements_ansible.txt \
|
||||
@@ -72,7 +82,7 @@ ADD requirements/requirements_ansible.txt \
|
||||
requirements/requirements_tower_uninstall.txt \
|
||||
requirements/requirements_git.txt \
|
||||
/tmp/requirements/
|
||||
RUN cd /tmp && VENV_BASE="/var/lib/awx/venv" make requirements
|
||||
RUN scl enable rh-postgresql10 """cd /tmp && VENV_BASE="/var/lib/awx/venv" make requirements"""
|
||||
|
||||
RUN yum -y remove cyrus-sasl-devel \
|
||||
gcc \
|
||||
@@ -82,13 +92,16 @@ RUN yum -y remove cyrus-sasl-devel \
|
||||
libxml2-devel \
|
||||
libxslt-devel \
|
||||
openldap-devel \
|
||||
postgresql-devel \
|
||||
rh-postgresql10-postgresql-devel \
|
||||
python-devel \
|
||||
python36-devel \
|
||||
nodejs \
|
||||
xmlsec1-devel \
|
||||
xmlsec1-openssl-devel
|
||||
|
||||
# makes postgres available for data migrations when upgrading
|
||||
RUN export PATH=/usr/pgsql-10/bin:$PATH
|
||||
|
||||
RUN yum -y clean all
|
||||
RUN rm -rf /root/.cache
|
||||
|
||||
|
||||
Reference in New Issue
Block a user