From 3f57061509824bb5dcda7171bfa916215f5f57dd Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Fri, 7 Feb 2020 13:06:42 -0500
Subject: [PATCH] Add packages missing from base images

Related:

- https://github.com/ansible/awx/issues/5770
- https://github.com/ansible/awx/issues/5724
---
 installer/roles/image_build/templates/Dockerfile.j2 | 7 +++++--
 tools/docker-compose/Dockerfile                     | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/installer/roles/image_build/templates/Dockerfile.j2 b/installer/roles/image_build/templates/Dockerfile.j2
index 4811d34023..90942bf102 100644
--- a/installer/roles/image_build/templates/Dockerfile.j2
+++ b/installer/roles/image_build/templates/Dockerfile.j2
@@ -11,8 +11,11 @@ RUN dnf -y update && \
   ansible \
   bubblewrap \
   curl \
+  diffutils \
+  dnf-utils \
   gcc \
   gcc-c++ \
+  gettext \
   git-core \
   glibc-langpack-en \
   krb5-workstation \
@@ -44,11 +47,11 @@ RUN dnf -y update && \
   tmux \
   unzip \
   vim-minimal \
+  which \
   xmlsec1 \
   xmlsec1-devel \
   xmlsec1-openssl \
-  xmlsec1-openssl-devel \
-  dnf-utils
+  xmlsec1-openssl-devel
 
 ADD https://github.com/krallin/tini/releases/download/v0.14.0/tini /tini
 RUN chmod +x /tini
diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index 3a5c635986..7607eee8e0 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -14,6 +14,8 @@ RUN dnf -y update && \
   ansible \
   bubblewrap \
   curl \
+  diffutils \
+  dnf-utils \
   gcc \
   gcc-c++ \
   gettext \
@@ -48,11 +50,11 @@ RUN dnf -y update && \
   tmux \
   unzip \
   vim-minimal \
+  which \
   xmlsec1 \
   xmlsec1-devel \
   xmlsec1-openssl \
-  xmlsec1-openssl-devel \
-  dnf-utils
+  xmlsec1-openssl-devel
 
 # UI tests only, do not put in installer/roles/image_build/templates/Dockerfile.j2
 RUN dnf -y install \