From 84ba3831996dd1292d1fe1732b4cca57fcedaeae Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@splat.cc>
Date: Tue, 29 Oct 2019 23:19:00 -0400
Subject: [PATCH 1/2] Trim the list of things installed during build

Swap git & vim for more minimal installs.
---
 tools/docker-compose/Dockerfile | 47 +++------------------------------
 1 file changed, 4 insertions(+), 43 deletions(-)

diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index 53f07722a2..fb16d0df87 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -11,37 +11,18 @@ RUN dnf -y update && \
   dnf module -y enable 'postgresql:10' && \
   dnf config-manager --set-enabled PowerTools && \
   dnf -y install acl \
-  alsa-lib \
   ansible \
-  atk \
   bubblewrap \
-  cups-libs \
   curl \
-  cyrus-sasl \
-  cyrus-sasl-devel \
   gcc \
   gcc-c++ \
-  GConf2 \
-  git \
-  gtk3 \
-  krb5-devel \
-  krb5-libs \
+  git-core \
   krb5-workstation \
   libcurl-devel \
   libffi-devel \
   libstdc++.so.6 \
   libtool-ltdl-devel \
   libcgroup-tools \
-  libXcomposite \
-  libXcursor \
-  libXdamage \
-  libXext \
-  libXi \
-  libxml2-devel \
-  libXrandr \
-  libXScrnSaver \
-  libxslt-devel \
-  libXtst \
   make \
   mercurial \
   nginx \
@@ -55,10 +36,6 @@ RUN dnf -y update && \
   python3-devel \
   python3-libselinux \
   python3-pip \
-  python3-psutil \
-  python3-psycopg2 \
-  python3-setuptools \
-  python3-devel \
   python3-setuptools \
   rsync \
   subversion \
@@ -66,17 +43,11 @@ RUN dnf -y update && \
   swig \
   tmux \
   unzip \
-  vim \
+  vim-minimal \
   xmlsec1 \
   xmlsec1-devel \
   xmlsec1-openssl \
   xmlsec1-openssl-devel \
-  xorg-x11-fonts-100dpi \
-  xorg-x11-fonts-75dpi \
-  xorg-x11-fonts-cyrillic \
-  xorg-x11-fonts-misc \
-  xorg-x11-fonts-Type1 \
-  xorg-x11-utils \
   dnf-utils
 
 ENV PATH="/usr/pgsql-10/bin:${PATH}"
@@ -121,20 +92,10 @@ RUN cd /usr/local/bin && \
 ADD tools/docker-compose/google-cloud-sdk.repo /etc/yum.repos.d/
 RUN dnf install -y kubectl
 
-RUN dnf -y remove cyrus-sasl-devel \
+RUN dnf -y remove *-devel \
   gcc \
   gcc-c++ \
-  krb5-devel \
-  libtool-ltdl-devel \
-  libxml2-devel \
-  libxslt-devel \
-  openldap-devel \
-  postgresql10-devel \
-  python-devel \
-  python36-devel \
-  nodejs \
-  xmlsec1-devel \
-  xmlsec1-openssl-devel
+  nodejs
 
 RUN dnf -y clean all
 

From 36996584f90ebac6bc5b091c08416a453b276b7d Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@splat.cc>
Date: Wed, 30 Oct 2019 13:06:48 -0400
Subject: [PATCH 2/2] Re-add dependencies needed by UI tests to the dev env

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

diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index fb16d0df87..0496791aa5 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -48,7 +48,14 @@ RUN dnf -y update && \
   xmlsec1-devel \
   xmlsec1-openssl \
   xmlsec1-openssl-devel \
-  dnf-utils
+  dnf-utils && \
+
+# UI tests only, do not put in installer/roles/image_build/templates/Dockerfile.j2
+  dnf -y install \
+  gtk3 \
+  alsa-lib \
+  libX11-xcb \
+  libXScrnSaver
 
 ENV PATH="/usr/pgsql-10/bin:${PATH}"