From e280ea273d429b461eaf785edbb8a2bb5b947f07 Mon Sep 17 00:00:00 2001
From: armab <dev@arma.biz>
Date: Tue, 8 Dec 2020 15:13:49 +0000
Subject: [PATCH 1/2] Add python 3.6 PPA repository to Xenial packagingtest

---
 packagingtest/xenial/systemd/Dockerfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packagingtest/xenial/systemd/Dockerfile b/packagingtest/xenial/systemd/Dockerfile
index 363bd80..a00bd5c 100644
--- a/packagingtest/xenial/systemd/Dockerfile
+++ b/packagingtest/xenial/systemd/Dockerfile
@@ -41,7 +41,11 @@ RUN echo -e "#!/bin/sh\nexit 101\n" > /usr/sbin/policy-rc.d && \
     apt-get -y install gdebi-core sshpass cron netcat net-tools iproute
 
 # install apt https transport so apt sources can be added that refernece https:// URLs
-RUN apt-get -y install apt-transport-https ca-certificates
+RUN apt-get -y install apt-transport-https software-properties-common ca-certificates
+
+# Add python 3.6 repository from the 3rd party PPA as it's not available in base distro
+RUN add-apt-repository -y ppa:deadsnakes/ppa && \
+    apt-get update
 
 # install netbase package (includes /etc/protocols and other files we rely on)
 RUN apt-get -y install netbase

From 7655c7554fbf9d5a4f69147a500fd8e7b5fcc58d Mon Sep 17 00:00:00 2001
From: armab <dev@arma.biz>
Date: Tue, 8 Dec 2020 21:23:49 +0000
Subject: [PATCH 2/2] Fix CentOS8 build Error: No matching repo to modify:
 PowerTools

---
 buildpack/centos8/Dockerfile             | 4 ++--
 packagingbuild/Dockerfile.template       | 4 ++--
 packagingbuild/centos8/Dockerfile        | 4 ++--
 packagingtest/Dockerfile.common          | 4 ++--
 packagingtest/centos8/systemd/Dockerfile | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/buildpack/centos8/Dockerfile b/buildpack/centos8/Dockerfile
index 251cf84..510e793 100644
--- a/buildpack/centos8/Dockerfile
+++ b/buildpack/centos8/Dockerfile
@@ -7,13 +7,13 @@ RUN yum -y install \
     wget
 
 RUN yum install -y yum-utils \
-    && dnf config-manager --enable PowerTools \
+    && dnf config-manager --enable powertools \
     && yum install -y epel-release \
     && yum -y install \
     ImageMagick \
     ImageMagick-devel \
     libyaml-devel \
-    && dnf config-manager --disable PowerTools \
+    && dnf config-manager --disable powertools \
     && yum remove -y epel-release yum-utils
 
 # Build tools
diff --git a/packagingbuild/Dockerfile.template b/packagingbuild/Dockerfile.template
index 0e70e83..b681671 100644
--- a/packagingbuild/Dockerfile.template
+++ b/packagingbuild/Dockerfile.template
@@ -21,14 +21,14 @@ RUN yum -y install \
 
     {% if (version == '8') %}
 RUN yum install -y yum-utils \
-    && dnf config-manager --enable PowerTools \
+    && dnf config-manager --enable powertools \
     && yum install -y epel-release \
     && yum -y install \
     ImageMagick \
     ImageMagick-devel \
     libyaml-devel \
     glibc-langpack-en \
-    && dnf config-manager --disable PowerTools \
+    && dnf config-manager --disable powertools \
     && yum remove -y epel-release yum-utils
     {% endif %}
 
diff --git a/packagingbuild/centos8/Dockerfile b/packagingbuild/centos8/Dockerfile
index a5bc823..38bbb04 100644
--- a/packagingbuild/centos8/Dockerfile
+++ b/packagingbuild/centos8/Dockerfile
@@ -13,14 +13,14 @@ RUN yum -y install \git \
 
     
 RUN yum install -y yum-utils \
-    && dnf config-manager --enable PowerTools \
+    && dnf config-manager --enable powertools \
     && yum install -y epel-release \
     && yum -y install \
     ImageMagick \
     ImageMagick-devel \
     libyaml-devel \
     glibc-langpack-en \
-    && dnf config-manager --disable PowerTools \
+    && dnf config-manager --disable powertools \
     && yum remove -y epel-release yum-utils
     
 
diff --git a/packagingtest/Dockerfile.common b/packagingtest/Dockerfile.common
index 539b87d..760c2ec 100644
--- a/packagingtest/Dockerfile.common
+++ b/packagingtest/Dockerfile.common
@@ -21,7 +21,7 @@ RUN yum -y install \
     setup
     {% if (version == '8') %}
 RUN yum install -y yum-utils \
-    && dnf config-manager --enable PowerTools \
+    && dnf config-manager --enable powertools \
     && yum install -y epel-release \
     && yum -y install \
     ImageMagick \
@@ -29,7 +29,7 @@ RUN yum install -y yum-utils \
     libyaml-devel \
     libffi-devel \
     glibc-langpack-en \
-    && dnf config-manager --disable PowerTools \
+    && dnf config-manager --disable powertools \
     && yum remove -y epel-release yum-utils
     {% endif %}
 # Build tools
diff --git a/packagingtest/centos8/systemd/Dockerfile b/packagingtest/centos8/systemd/Dockerfile
index e8fd7a6..c586ce6 100644
--- a/packagingtest/centos8/systemd/Dockerfile
+++ b/packagingtest/centos8/systemd/Dockerfile
@@ -14,7 +14,7 @@ RUN yum -y install \
     setup
     
 RUN yum install -y yum-utils \
-    && dnf config-manager --enable PowerTools \
+    && dnf config-manager --enable powertools \
     && yum install -y epel-release \
     && yum -y install \
     ImageMagick \
@@ -22,7 +22,7 @@ RUN yum install -y yum-utils \
     libyaml-devel \
     libffi-devel \
     glibc-langpack-en \
-    && dnf config-manager --disable PowerTools \
+    && dnf config-manager --disable powertools \
     && yum remove -y epel-release yum-utils
     
 # Build tools