Merge pull request #466 from splunk/release/739-master

Release/7.3.9
splunk · Mar 4, 2021 · b2c342c · b2c342c
2 parents 951299b + 523f3a0
commit b2c342c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,11 @@ Welcome to the official Splunk repository of Dockerfiles for building Splunk Ent
 
 ----
 
+> :warning: **DEPRECATION NOTICE**  
+We will no longer be releasing Debian images on Docker Hub after Spring of 2021.
+
+----
+
 ## Table of Contents
 
 1. [Purpose](#purpose)

diff --git a/base/debian-10/install.sh b/base/debian-10/install.sh
@@ -59,7 +59,7 @@ cp apt_inst.cpython-37m-x86_64-linux-gnu.so apt_inst.so
 rm -rf /tmp/python3-apt
 # Install splunk-ansible dependencies
 cd /
-pip -q --no-cache-dir install wheel requests ansible jmespath --upgrade
+pip -q --no-cache-dir install six wheel requests ansible jmespath --upgrade
 # Remove tests packaged in python libs
 find /usr/lib/ -depth \( -type d -a -not -wholename '*/ansible/plugins/test' -a \( -name test -o -name tests -o -name idle_test \) \) -exec rm -rf '{}' \;
 find /usr/lib/ -depth \( -type f -a -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) -exec rm -rf '{}' \;

diff --git a/base/debian-9/install.sh b/base/debian-9/install.sh
@@ -48,17 +48,17 @@ ln -sf /usr/bin/python${PY_SHORT} /usr/bin/python
 ln -sf /usr/bin/pip${PY_SHORT} /usr/bin/pip
 # For ansible apt module
 cd /tmp
-apt-get download python3-apt=1.4.2
-dpkg -x python3-apt_1.4.2_amd64.deb python3-apt
-rm python3-apt_1.4.2_amd64.deb
+apt-get download python3-apt=1.4.3
+dpkg -x python3-apt_1.4.3_amd64.deb python3-apt
+rm python3-apt_1.4.3_amd64.deb
 cp -r /tmp/python3-apt/usr/lib/python3/dist-packages/* /usr/lib/python${PY_SHORT}/site-packages/
 cd /usr/lib/python${PY_SHORT}/site-packages/
 cp apt_pkg.cpython-35m-x86_64-linux-gnu.so apt_pkg.so
 cp apt_inst.cpython-35m-x86_64-linux-gnu.so apt_inst.so
 rm -rf /tmp/python3-apt
 # Install splunk-ansible dependencies
 cd /
-pip -q --no-cache-dir install wheel requests ansible jmespath --upgrade
+pip -q --no-cache-dir install six wheel requests ansible jmespath --upgrade
 # Remove tests packaged in python libs
 find /usr/lib/ -depth \( -type d -a -not -wholename '*/ansible/plugins/test' -a \( -name test -o -name tests -o -name idle_test \) \) -exec rm -rf '{}' \;
 find /usr/lib/ -depth \( -type f -a -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) -exec rm -rf '{}' \;

diff --git a/base/redhat-8/install.sh b/base/redhat-8/install.sh
@@ -45,7 +45,7 @@ ln -sf /usr/bin/python${PY_SHORT} /usr/bin/python
 ln -sf /usr/bin/pip${PY_SHORT} /usr/bin/pip
 # Install splunk-ansible dependencies
 cd /
-pip -q --no-cache-dir install wheel requests ansible jmespath --upgrade
+pip -q --no-cache-dir install six wheel requests ansible jmespath --upgrade
 # Remove tests packaged in python libs
 find /usr/lib/ -depth \( -type d -a -not -wholename '*/ansible/plugins/test' -a \( -name test -o -name tests -o -name idle_test \) \) -exec rm -rf '{}' \;
 find /usr/lib/ -depth \( -type f -a -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) -exec rm -rf '{}' \;

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,7 +1,15 @@
 ## Changelog
 
+----
+
+> :warning: **DEPRECATION NOTICE**  
+We will no longer be releasing Debian images on Docker Hub after Spring of 2021.
+
+----
+
 ## Navigation
 
+* [8.1.2](#812)
 * [8.1.1](#811)
 * [8.1.0.1](#8101)
 * [8.1.0](#810)
@@ -18,6 +26,7 @@
 * [8.0.2](#802)
 * [8.0.1](#801)
 * [8.0.0](#800)
+* [7.3.9](#739)
 * [7.3.8](#738)
 * [7.3.7](#737)
 * [7.3.6](#736)
@@ -326,6 +335,17 @@
 
 ---
 
+## 7.3.9
+
+#### What's New?
+* New Splunk Enterprise maintenance patch. For details, see [Fixed issues for 7.3.9](https://docs.splunk.com/Documentation/Splunk/7.3.9/ReleaseNotes/Fixedissues)
+* Bundling in changes to be consistent with the release of [8.1.2](#812)
+
+#### Changes
+* See [8.1.2](#812) changes
+
+---
+
 ## 7.3.8
 
 #### What's New?