Merge tag '2.4.2' into develop

* Fixing docker / requests issue
ordinaryexperts · Feb 23, 2024 · 9771b5c · 9771b5c
2 parents efcbfa0 + e2c96f3
commit 9771b5c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Unreleased
 
+# 2.4.2
+
+* Upgrade Taskcat to 0.9.41
+* Fix Taskcat / Docker issue
+
 # 2.4.1
 
 * Install packer amazon plugin

diff --git a/setup-env.sh b/setup-env.sh
@@ -4,7 +4,7 @@ echo "$(date): Starting setup-env.sh"
 
 export CDK_VERSION=2.120.0
 export PACKER_VERSION=1.10.0
-export TASKCAT_VERSION=0.9.40
+export TASKCAT_VERSION=0.9.41
 
 # system upgrades and tools
 export DEBIAN_FRONTEND=noninteractive
@@ -29,6 +29,9 @@ cd -
 # taskcat
 apt-get -y -q install python3 python3-pip
 pip3 install -q taskcat==$TASKCAT_VERSION
+# https://github.com/docker/docker-py/issues/3113#issuecomment-1531621678
+pip3 uninstall requests
+pip3 install requests==2.28.1
 
 # For scripts/pfl.py
 pip3 install -q \