Upgrade bundled python to 3.8.10 (signalfx#2006)

* Upgrade bundled python to 3.8.10 * Update owasp/dependency-check to 6.5.0
dloucasfx · Nov 29, 2021 · 303e0fc · 303e0fc
1 parent e087614
commit 303e0fc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -478,7 +478,7 @@ jobs:
 
   dependency_check:
     docker:
-      - image: owasp/dependency-check:6.0.1
+      - image: owasp/dependency-check:6.5.0
         user: root
     steps:
       - checkout

diff --git a/Dockerfile b/Dockerfile
@@ -79,7 +79,7 @@ RUN cd /usr/src/agent-java/jmx &&\
 FROM ubuntu:18.04 as collectd
 
 ARG TARGET_ARCH
-ARG PYTHON_VERSION=3.8.0
+ARG PYTHON_VERSION=3.8.10
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -282,6 +282,8 @@ RUN python3 -m pip list
 
 # Remove pip to avoid usage in python monitor and in exec'd container
 RUN python3 -m pip uninstall pip -y
+# Delete the bundled pip wheel
+RUN find /usr/local/lib/python3.8/ensurepip -name "pip-*.whl" -delete
 
 # Delete all compiled python to save space
 RUN find /usr/local/lib/python3.8 -name "*.pyc" -o -name "*.pyo" | xargs rm

diff --git a/scripts/dependency-check/run.sh b/scripts/dependency-check/run.sh
@@ -22,7 +22,7 @@ docker run --rm \
     -v $BUNDLE_DIR:/bundle \
     -v $HOME/.cache/dependency-check:/usr/share/dependency-check/data \
     -v $REPO_DIR:/src \
-    owasp/dependency-check:6.0.1 \
+    owasp/dependency-check:6.5.0 \
         --scan /bundle \
         --project "$BUNDLE_PATH" \
         --suppression /src/scripts/dependency-check/suppression.xml \

diff --git a/scripts/windows/bundle.ps1 b/scripts/windows/bundle.ps1
@@ -3,7 +3,7 @@ $scriptDir = split-path -parent $MyInvocation.MyCommand.Definition
 . $scriptDir\common.ps1
 
 $BUILD_DIR="$scriptDir\..\..\bundle\signalfx-agent"
-$PYTHON_VERSION="3.8.0"
+$PYTHON_VERSION="3.8.10"
 $PIP_VERSION="21.0.1"
 $NUGET_URL="https://aka.ms/nugetclidl"
 $NUGET_EXE="nuget.exe"
@@ -27,6 +27,7 @@ function get_collectd_plugins ([string]$buildDir=$BUILD_DIR) {
     & $python -m pip list
     & $python -m pip uninstall pip -y
     if ($lastexitcode -ne 0){ throw }
+    Get-ChildItem -Recurse -Path "$buildDir\python\Lib\ensurepip\*" -Include "pip-*.whl" | Remove-Item
 }
 
 function download_nuget([string]$url=$NUGET_URL, [string]$outputDir=$BUILD_DIR) {