From a4b2d6bf8896ac28a8edfd8d9f9f3320f0fd572a Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Tue, 16 Jul 2019 09:18:24 -0400
Subject: [PATCH 1/2] Revert "Change the devel containers to be based on Fedora
 instead of CentOS"

This reverts commit 7936dff188801a87003da22d09b829579923aeff.
---
 tools/docker-compose/Dockerfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index 0d7671fe23..1944ae9b4e 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -1,9 +1,11 @@
-FROM fedora:27
+FROM centos:7
 
 ARG UID=0
 
+RUN yum -y update && yum -y install epel-release
+
 # sync with installer/roles/image_build/templates/Dockerfile.j2
-RUN dnf -y install acl \
+RUN yum -y install acl \
   alsa-lib \
   ansible \
   atk \
@@ -12,15 +14,12 @@ RUN dnf -y install acl \
   curl \
   cyrus-sasl \
   cyrus-sasl-devel \
-  findutils \
   gcc \
   gcc-c++ \
   GConf2 \
   git \
-  glibc-locale-source \
   gtk3 \
   ipa-gothic-fonts \
-  iproute \
   krb5-devel \
   krb5-libs \
   krb5-workstation \
@@ -53,9 +52,10 @@ RUN dnf -y install acl \
   python-psutil \
   python-psycopg2 \
   python-setuptools \
-  python3-devel \
-  python3-setuptools \
+  python36-devel \
+  python36-setuptools \
   rsync \
+  setools-libs \
   subversion \
   sudo \
   swig \

From b620d8505ad7208d3d0f993f65a2fa5c7c704022 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Tue, 16 Jul 2019 09:57:31 -0400
Subject: [PATCH 2/2] build and link a newer sqlite3 to make Django happy

---
 tools/docker-compose/Dockerfile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index 1944ae9b4e..413be8b7da 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -106,6 +106,14 @@ RUN cd /tmp && VENV_BASE="/venv" make requirements_dev
 RUN npm install -g n
 RUN n 10.15.0
 
+# Install a newer SQLite to make Django happy (centos7 has a really old one,
+# and we can probably stop doing this in centos8)
+RUN curl -O "https://sqlite.org/2019/sqlite-autoconf-3290000.tar.gz"
+RUN tar zxvf sqlite-autoconf-3290000.tar.gz
+RUN cd sqlite-autoconf-3290000 && ./configure && make && make install
+RUN mv -f /usr/local/lib/libsqlite3.so.0 /lib64/
+RUN mv -f /usr/local/lib/libsqlite3.so.0.8.6 /lib64/
+
 RUN yum -y remove cyrus-sasl-devel \
   gcc \
   gcc-c++ \