From d9df72008f1893f246f2bf960e88771410fc8f33 Mon Sep 17 00:00:00 2001
From: JP Bourget <jp@syncurity.net>
Date: Wed, 8 Jan 2020 16:11:57 -0500
Subject: [PATCH] move yum installs for dependencies over to dockerbuild

---
 packagingtest/Dockerfile.common          | 16 ++++++++++++++--
 packagingtest/centos8/systemd/Dockerfile | 17 ++++++++++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/packagingtest/Dockerfile.common b/packagingtest/Dockerfile.common
index a825846..8788645 100644
--- a/packagingtest/Dockerfile.common
+++ b/packagingtest/Dockerfile.common
@@ -27,6 +27,7 @@ RUN yum install -y yum-utils \
     ImageMagick \
     ImageMagick-devel \
     libyaml-devel \
+    libffi-devel \
     glibc-langpack-en \
     && dnf config-manager --disable PowerTools \
     && yum remove -y epel-release yum-utils
@@ -48,7 +49,6 @@ RUN yum -y install \
     {%- endif %}
     libcurl-devel \
     libevent-devel \
-    libffi-devel \
     libjpeg-devel \
     libtool \
     libwebp-devel \
@@ -67,7 +67,19 @@ RUN yum -y install \
     sqlite-devel \
     xz \
     xz-devel \
-    zlib-devel
+    zlib-devel {% if (version == '8') %}\
+    python3 \
+    python3-virtualenv \
+    python3-devel \
+    openssl-devel \
+    pam \
+    openssh-server \
+    openssh-clients \
+    setup \
+    zip \
+    unzip{%- endif %}
+
+
 
 # St2 package build debs
 RUN yum -y install \
diff --git a/packagingtest/centos8/systemd/Dockerfile b/packagingtest/centos8/systemd/Dockerfile
index fa97f68..95efa2f 100644
--- a/packagingtest/centos8/systemd/Dockerfile
+++ b/packagingtest/centos8/systemd/Dockerfile
@@ -20,6 +20,7 @@ RUN yum install -y yum-utils \
     ImageMagick \
     ImageMagick-devel \
     libyaml-devel \
+    libffi-devel \
     glibc-langpack-en \
     && dnf config-manager --disable PowerTools \
     && yum remove -y epel-release yum-utils
@@ -37,7 +38,6 @@ RUN yum -y install \
     glibc-devel \
     libcurl-devel \
     libevent-devel \
-    libffi-devel \
     libjpeg-devel \
     libtool \
     libwebp-devel \
@@ -53,7 +53,19 @@ RUN yum -y install \
     sqlite-devel \
     xz \
     xz-devel \
-    zlib-devel
+    zlib-devel \
+    python3 \
+    python3-virtualenv \
+    python3-devel \
+    openssl-devel \
+    pam \
+    openssh-server \
+    openssh-clients \
+    setup \
+    zip \
+    unzip
+
+
 
 # St2 package build debs
 RUN yum -y install \
@@ -80,7 +92,6 @@ RUN sed -ri 's/^session\s+required\s+pam_loginuid.so$/session optional pam_login
         echo 'root:docker.io' | chpasswd
 
 RUN yum -y install nc net-tools glibc-locale-source && \
-
     # -i: specify the locale definition file
     # -f: specify the character set
     localedef -i en_US -f UTF-8 en_US.UTF-8