From 27b280f68fdcb1cce08df0efacf02414b92310ae Mon Sep 17 00:00:00 2001
From: Aditya Pingle <apingle@splunk.com>
Date: Wed, 22 Jun 2022 14:18:03 -0400
Subject: [PATCH 1/5] updated Dockerfile to pin ansible-base version to 2.10.2;

---
 py23-image/centos-7/Dockerfile  | 2 +-
 py23-image/centos-8/Dockerfile  | 4 ++--
 py23-image/debian-10/Dockerfile | 2 +-
 py23-image/debian-9/Dockerfile  | 2 +-
 py23-image/redhat-8/Dockerfile  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/py23-image/centos-7/Dockerfile b/py23-image/centos-7/Dockerfile
index 04a439f6..68b10229 100644
--- a/py23-image/centos-7/Dockerfile
+++ b/py23-image/centos-7/Dockerfile
@@ -22,4 +22,4 @@ RUN wget https://www.python.org/ftp/python/3.7.4/Python-3.7.4.tgz \
 RUN yum remove -y --setopt=tsflags=noscripts gcc openssl-devel bzip2-devel libffi-devel \
     && yum autoremove -y \
     && yum clean all
-RUN pip3 --no-cache-dir install ansible==3.4.0 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
+RUN pip3 --no-cache-dir install ansible==3.4.0 ansible-base==2.10.2 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
diff --git a/py23-image/centos-8/Dockerfile b/py23-image/centos-8/Dockerfile
index db936b26..65d65866 100644
--- a/py23-image/centos-8/Dockerfile
+++ b/py23-image/centos-8/Dockerfile
@@ -26,5 +26,5 @@ RUN wget https://www.python.org/ftp/python/3.7.4/Python-3.7.4.tgz \
 RUN yum remove -y --setopt=tsflags=noscripts gcc openssl-devel bzip2-devel libffi-devel \
     && yum autoremove -y \
     && yum clean all
-RUN pip3 --no-cache-dir install ansible==3.4.0 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0 \
-    && pip --no-cache-dir install requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
+RUN pip3 --no-cache-dir install ansible==3.4.0 ansible-base==2.10.2 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0 \
+    && pip --no-cache-dir install requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0 ansible==3.4.0 ansible-base==2.10.2
diff --git a/py23-image/debian-10/Dockerfile b/py23-image/debian-10/Dockerfile
index 8ff6d359..a003fc25 100644
--- a/py23-image/debian-10/Dockerfile
+++ b/py23-image/debian-10/Dockerfile
@@ -8,4 +8,4 @@ RUN apt-get update -y \
     && ln -sf /usr/bin/pip3.7 /usr/bin/pip3 \
     && ln -sf /usr/bin/python3.7 /usr/bin/python \
     && ln -sf /usr/bin/pip3.7 /usr/bin/pip \
-    && pip3 install --upgrade ansible==3.4.0 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
+    && pip3 install --upgrade ansible==3.4.0 ansible-base==2.10.2 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
diff --git a/py23-image/debian-9/Dockerfile b/py23-image/debian-9/Dockerfile
index 69779918..966c5279 100644
--- a/py23-image/debian-9/Dockerfile
+++ b/py23-image/debian-9/Dockerfile
@@ -8,4 +8,4 @@ RUN apt-get update -y \
     && ln -sf /usr/bin/pip3.7 /usr/bin/pip3 \
     && ln -sf /usr/bin/python3.7 /usr/bin/python \
     && ln -sf /usr/bin/pip3.7 /usr/bin/pip \
-    && pip3 install --upgrade ansible==3.4.0 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
+    && pip3 install --upgrade ansible==3.4.0 ansible-base==2.10.2 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
diff --git a/py23-image/redhat-8/Dockerfile b/py23-image/redhat-8/Dockerfile
index 89676579..ee1e4b5d 100644
--- a/py23-image/redhat-8/Dockerfile
+++ b/py23-image/redhat-8/Dockerfile
@@ -9,4 +9,4 @@ RUN microdnf -y --nodocs update \
     && ln -sf /usr/bin/pip3.7 /usr/bin/pip3 \
     && ln -sf /usr/bin/python3.7 /usr/bin/python \
     && ln -sf /usr/bin/pip3.7 /usr/bin/pip \
-    && pip3 install --upgrade ansible==3.4.0 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
+    && pip3 install --upgrade ansible==3.4.0 ansible-base==2.10.2 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0

From da98b5c65eb947d7409d58098ed9aa635aac4d9a Mon Sep 17 00:00:00 2001
From: Aditya Pingle <apingle@splunk.com>
Date: Thu, 23 Jun 2022 10:01:14 -0400
Subject: [PATCH 2/5] debug: undo change for debian-10 and redhat-8;

---
 py23-image/debian-10/Dockerfile | 2 +-
 py23-image/redhat-8/Dockerfile  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/py23-image/debian-10/Dockerfile b/py23-image/debian-10/Dockerfile
index a003fc25..8ff6d359 100644
--- a/py23-image/debian-10/Dockerfile
+++ b/py23-image/debian-10/Dockerfile
@@ -8,4 +8,4 @@ RUN apt-get update -y \
     && ln -sf /usr/bin/pip3.7 /usr/bin/pip3 \
     && ln -sf /usr/bin/python3.7 /usr/bin/python \
     && ln -sf /usr/bin/pip3.7 /usr/bin/pip \
-    && pip3 install --upgrade ansible==3.4.0 ansible-base==2.10.2 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
+    && pip3 install --upgrade ansible==3.4.0 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
diff --git a/py23-image/redhat-8/Dockerfile b/py23-image/redhat-8/Dockerfile
index ee1e4b5d..89676579 100644
--- a/py23-image/redhat-8/Dockerfile
+++ b/py23-image/redhat-8/Dockerfile
@@ -9,4 +9,4 @@ RUN microdnf -y --nodocs update \
     && ln -sf /usr/bin/pip3.7 /usr/bin/pip3 \
     && ln -sf /usr/bin/python3.7 /usr/bin/python \
     && ln -sf /usr/bin/pip3.7 /usr/bin/pip \
-    && pip3 install --upgrade ansible==3.4.0 ansible-base==2.10.2 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
+    && pip3 install --upgrade ansible==3.4.0 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0

From dfa831a69ebe0e70cb7aeb905a668d2fc9349f96 Mon Sep 17 00:00:00 2001
From: Aditya Pingle <apingle@splunk.com>
Date: Wed, 29 Jun 2022 11:12:30 -0500
Subject: [PATCH 3/5] debug: remove changes and add dummy line;

---
 base/debian-10/install.sh      | 6 +++---
 py23-image/centos-7/Dockerfile | 2 +-
 py23-image/centos-8/Dockerfile | 2 +-
 py23-image/debian-9/Dockerfile | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/base/debian-10/install.sh b/base/debian-10/install.sh
index 28bdb290..9807ded5 100755
--- a/base/debian-10/install.sh
+++ b/base/debian-10/install.sh
@@ -37,8 +37,8 @@ apt-get install -y --no-install-recommends curl sudo libgssapi-krb5-2 busybox pr
 
 # Install Python and necessary packages
 PY_SHORT=${PYTHON_VERSION%.*}
-wget -O /tmp/python.tgz https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz
-wget -O /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz.asc
+wget --no-check-certificate -O /tmp/python.tgz https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz
+wget --no-check-certificate -O /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz.asc
 gpg --recv-keys $PYTHON_GPG_KEY_ID
 gpg --verify /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc /tmp/python.tgz
 rm /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc
@@ -76,7 +76,7 @@ apt-get remove -y --allow-remove-essential gcc libffi-dev libssl-dev make build-
 apt-get autoremove -y --allow-remove-essential
 
 # Install scloud
-wget -O /usr/bin/scloud.tar.gz ${SCLOUD_URL}
+wget --no-check-certificate -O /usr/bin/scloud.tar.gz ${SCLOUD_URL}
 tar -xf /usr/bin/scloud.tar.gz -C /usr/bin/
 rm /usr/bin/scloud.tar.gz
 
diff --git a/py23-image/centos-7/Dockerfile b/py23-image/centos-7/Dockerfile
index 68b10229..04a439f6 100644
--- a/py23-image/centos-7/Dockerfile
+++ b/py23-image/centos-7/Dockerfile
@@ -22,4 +22,4 @@ RUN wget https://www.python.org/ftp/python/3.7.4/Python-3.7.4.tgz \
 RUN yum remove -y --setopt=tsflags=noscripts gcc openssl-devel bzip2-devel libffi-devel \
     && yum autoremove -y \
     && yum clean all
-RUN pip3 --no-cache-dir install ansible==3.4.0 ansible-base==2.10.2 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
+RUN pip3 --no-cache-dir install ansible==3.4.0 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
diff --git a/py23-image/centos-8/Dockerfile b/py23-image/centos-8/Dockerfile
index 65d65866..a722c6fd 100644
--- a/py23-image/centos-8/Dockerfile
+++ b/py23-image/centos-8/Dockerfile
@@ -26,5 +26,5 @@ RUN wget https://www.python.org/ftp/python/3.7.4/Python-3.7.4.tgz \
 RUN yum remove -y --setopt=tsflags=noscripts gcc openssl-devel bzip2-devel libffi-devel \
     && yum autoremove -y \
     && yum clean all
-RUN pip3 --no-cache-dir install ansible==3.4.0 ansible-base==2.10.2 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0 \
+RUN pip3 --no-cache-dir install ansible==3.4.0 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0 \
     && pip --no-cache-dir install requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0 ansible==3.4.0 ansible-base==2.10.2
diff --git a/py23-image/debian-9/Dockerfile b/py23-image/debian-9/Dockerfile
index 966c5279..3f3f1a33 100644
--- a/py23-image/debian-9/Dockerfile
+++ b/py23-image/debian-9/Dockerfile
@@ -8,4 +8,5 @@ RUN apt-get update -y \
     && ln -sf /usr/bin/pip3.7 /usr/bin/pip3 \
     && ln -sf /usr/bin/python3.7 /usr/bin/python \
     && ln -sf /usr/bin/pip3.7 /usr/bin/pip \
-    && pip3 install --upgrade ansible==3.4.0 ansible-base==2.10.2 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
+    && pip3 install --upgrade ansible==3.4.0 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0
+

From 03bbd63176da9b4404df445ecd890d9486318578 Mon Sep 17 00:00:00 2001
From: Aditya Pingle <apingle@splunk.com>
Date: Wed, 29 Jun 2022 12:39:27 -0500
Subject: [PATCH 4/5] revert changes;

---
 base/debian-10/install.sh      | 6 +++---
 py23-image/centos-8/Dockerfile | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/base/debian-10/install.sh b/base/debian-10/install.sh
index 9807ded5..28bdb290 100755
--- a/base/debian-10/install.sh
+++ b/base/debian-10/install.sh
@@ -37,8 +37,8 @@ apt-get install -y --no-install-recommends curl sudo libgssapi-krb5-2 busybox pr
 
 # Install Python and necessary packages
 PY_SHORT=${PYTHON_VERSION%.*}
-wget --no-check-certificate -O /tmp/python.tgz https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz
-wget --no-check-certificate -O /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz.asc
+wget -O /tmp/python.tgz https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz
+wget -O /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz.asc
 gpg --recv-keys $PYTHON_GPG_KEY_ID
 gpg --verify /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc /tmp/python.tgz
 rm /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc
@@ -76,7 +76,7 @@ apt-get remove -y --allow-remove-essential gcc libffi-dev libssl-dev make build-
 apt-get autoremove -y --allow-remove-essential
 
 # Install scloud
-wget --no-check-certificate -O /usr/bin/scloud.tar.gz ${SCLOUD_URL}
+wget -O /usr/bin/scloud.tar.gz ${SCLOUD_URL}
 tar -xf /usr/bin/scloud.tar.gz -C /usr/bin/
 rm /usr/bin/scloud.tar.gz
 
diff --git a/py23-image/centos-8/Dockerfile b/py23-image/centos-8/Dockerfile
index a722c6fd..fab16655 100644
--- a/py23-image/centos-8/Dockerfile
+++ b/py23-image/centos-8/Dockerfile
@@ -27,4 +27,4 @@ RUN yum remove -y --setopt=tsflags=noscripts gcc openssl-devel bzip2-devel libff
     && yum autoremove -y \
     && yum clean all
 RUN pip3 --no-cache-dir install ansible==3.4.0 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0 \
-    && pip --no-cache-dir install requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0 ansible==3.4.0 ansible-base==2.10.2
+    && pip --no-cache-dir install requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0 ansible==3.4.0

From 6ebf361ae926b4427b9890b5b772b748f46e1440 Mon Sep 17 00:00:00 2001
From: Aditya Pingle <apingle@splunk.com>
Date: Wed, 29 Jun 2022 12:40:20 -0500
Subject: [PATCH 5/5] revert changes;

---
 py23-image/centos-8/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py23-image/centos-8/Dockerfile b/py23-image/centos-8/Dockerfile
index fab16655..db936b26 100644
--- a/py23-image/centos-8/Dockerfile
+++ b/py23-image/centos-8/Dockerfile
@@ -27,4 +27,4 @@ RUN yum remove -y --setopt=tsflags=noscripts gcc openssl-devel bzip2-devel libff
     && yum autoremove -y \
     && yum clean all
 RUN pip3 --no-cache-dir install ansible==3.4.0 requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0 \
-    && pip --no-cache-dir install requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0 ansible==3.4.0
+    && pip --no-cache-dir install requests==2.25.1 pyyaml==5.4.1 jmespath==0.10.0