Stop using PG SCL in dev env

installer/roles/image_build/files/supervisor.conf

@@ -13,7 +13,7 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [program:uwsgi]
-command = /usr/bin/scl enable rh-postgresql10 '/var/lib/awx/venv/awx/bin/uwsgi --socket 127.0.0.1:8050 --module=awx.wsgi:application --vacuum --processes=5 --harakiri=120 --no-orphans --master --max-requests=1000 --master-fifo=/var/lib/awx/awxfifo --lazy-apps -b 32768'
+command = /var/lib/awx/venv/awx/bin/uwsgi --socket 127.0.0.1:8050 --module=awx.wsgi:application --vacuum --processes=5 --harakiri=120 --no-orphans --master --max-requests=1000 --master-fifo=/var/lib/awx/awxfifo --lazy-apps -b 32768
 directory = /var/lib/awx
 autostart = true
 autorestart = true
@@ -25,7 +25,7 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [program:daphne]
-command = /usr/bin/scl enable rh-postgresql10 '/var/lib/awx/venv/awx/bin/daphne -b 127.0.0.1 -p 8051 --websocket_timeout -1 awx.asgi:channel_layer'
+command = /var/lib/awx/venv/awx/bin/daphne -b 127.0.0.1 -p 8051 --websocket_timeout -1 awx.asgi:channel_layer
 directory = /var/lib/awx
 autostart = true
 autorestart = true

installer/roles/image_build/templates/Dockerfile.j2

@@ -82,7 +82,7 @@ ADD requirements/requirements_ansible.txt \
     requirements/requirements_tower_uninstall.txt \
     requirements/requirements_git.txt \
     /tmp/requirements/
-RUN scl enable rh-postgresql10 """cd /tmp && VENV_BASE="/var/lib/awx/venv" make requirements"""
+RUN cd /tmp && VENV_BASE="/var/lib/awx/venv" make requirements
 
 RUN yum -y remove cyrus-sasl-devel \
   gcc \

tools/docker-compose.yml

@@ -44,13 +44,8 @@ services:
 
   # Postgres Database Container
   postgres:
-    image: centos/postgresql-10-centos7
+    image: postgres:10
     container_name: tools_postgres_1
-    environment:
-      POSTGRESQL_USER: awx
-      POSTGRESQL_PASSWORD: awxpass
-      POSTGRESQL_DATABASE: awx
-      POSTGRESQL_ADMIN_PASSWORD: postgrespass
     ports:
         - "5432:5432"
   memcached:

tools/docker-compose/Dockerfile

@@ -5,11 +5,9 @@ ARG UID=0
 # Add ansible-devel so that we get collections!
 ADD tools/docker-compose/ansible_nightly.repo /etc/yum.repos.d/ansible_nightly.repo
 
-# 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 
+RUN yum -y update && yum -y install epel-release && \
+    yum -y install https://centos7.iuscommunity.org/ius-release.rpm \
+    yum install https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm
 
 # sync with installer/roles/image_build/templates/Dockerfile.j2
 RUN yum -y install acl \
@@ -54,10 +52,9 @@ RUN yum -y install acl \
   openldap-devel \
   openssh-server \
   patch \
-  rh-postgresql10-postgresql-devel \
-  rh-postgresql10-postgresql-server-syspaths \
-  scl-utils-build \
-  scl-utils \
+  postgresql10 \
+  postgresql10-contrib \
+  postgresql10-devel \
   python-devel \
   python-pip \
   python-psutil \
@@ -85,14 +82,13 @@ RUN yum -y install acl \
   xorg-x11-utils \
   yum-utils
 
+ENV PATH="/usr/pgsql-10/bin:${PATH}"
+
 RUN yum install -y https://github.com/krallin/tini/releases/download/v0.18.0/tini_0.18.0.rpm
 
 RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa
 RUN mkdir -p /data/db
 
-# symlink python interpreter
-RUN ln -s /awx_devel/tools/scripts/awx-python /usr/bin/awx-python
-
 ADD tools/docker-compose/awx.egg-link /tmp/awx.egg-link
 ADD tools/docker-compose/awx-manage /usr/local/bin/awx-manage
 ADD tools/docker-compose/awx.egg-info /tmp/awx.egg-info
@@ -114,7 +110,7 @@ ADD requirements/requirements.txt \
   requirements/requirements_tower_uninstall.txt \
   /tmp/requirements/
 RUN mkdir -p /venv && chmod g+w /venv
-RUN scl enable rh-postgresql10 """cd /tmp && VENV_BASE="/venv" make requirements_dev"""
+RUN cd /tmp && VENV_BASE="/venv" make requirements_dev
 
 # Use the distro provided npm to bootstrap our required version of node
 RUN npm install -g n
@@ -136,7 +132,7 @@ RUN yum -y remove cyrus-sasl-devel \
   libxml2-devel \
   libxslt-devel \
   openldap-devel \
-  rh-postgresql10-postgresql-devel \
+  postgresql10-devel \
   python-devel \
   python36-devel \
   nodejs \
@@ -147,9 +143,6 @@ RUN yum -y clean all
 
 RUN rm -rf /root/.cache
 
-# makes postgres available for data migrations when upgrading
-RUN export PATH=/usr/pgsql-10/bin:$PATH
-
 RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
@@ -164,6 +157,7 @@ ADD tools/docker-compose/bootstrap_development.sh /bootstrap_development.sh
 EXPOSE 8043 8013 8080 22
 
 ADD tools/docker-compose/entrypoint.sh /
+ADD tools/scripts/awx-python /usr/bin/awx-python
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["/bin/bash"]
 

tools/docker-compose/entrypoint.sh

@@ -11,4 +11,4 @@ EOF
   rm /tmp/passwd
 fi
 
-exec scl enable rh-postgresql10 -- "$@"
+exec $@