DXE-6206 Merge pull request #140 from akamai/release/v2.33.5

Release/v2.33.5 - fix

Author: artbookspirit

CHANGELOG.md

@@ -3,7 +3,7 @@
 ## v2.33.5 (Feb 26, 2026)
 
 * Upgraded Akamai Terraform Provider to `v10.0.0`.
-* Fixed problems with `appsec` and `firewall` images.
+* Fixed problems with `appsec`, `cloudlets` and `firewall` images.
 
 ## v2.33.4 (Jan 22, 2026)
 

dockerfiles/cloudlets.Dockerfile

@@ -10,18 +10,20 @@ ARG BASE=akamai/base
 
 FROM ${BASE}
 
+COPY patches/ /tmp/patches/
+
 RUN mkdir -p /cli/.akamai-cli/src \
   && apk add --no-cache python3 py3-pip \
-  && apk add --no-cache --virtual .dev git gcc python3-dev py3-setuptools libffi-dev musl-dev openssl-dev \
+  && apk add --no-cache --virtual .dev git gcc python3-dev libffi-dev musl-dev openssl-dev \
   && git clone https://github.com/akamai/cli-cloudlets.git /cli/.akamai-cli/src/cli-cloudlets \
+  && git -C /cli/.akamai-cli/src/cli-cloudlets apply --ignore-whitespace /tmp/patches/cli-cloudlets.patch \
+  && rm -rf /tmp/patches \
   && python3 -m venv /cli/.akamai-cli/venv/cli-cloudlets \
   && source /cli/.akamai-cli/venv/cli-cloudlets/bin/activate \
   && python -m pip install --no-cache-dir --upgrade pip \
   && python -m pip install --no-cache-dir --only-binary :all: -r /cli/.akamai-cli/src/cli-cloudlets/requirements.txt \
-  # Force upgrade setuptools to fix CVE-2025-47273 (even though requirements.txt has it, ensure it's applied)
-  && python -m pip install --no-cache-dir --upgrade --force-reinstall 'setuptools>=78.1.1' \
   && deactivate \
-  # Remove pip from the venv to reduce attack surface (keep setuptools for pkg_resources needed by prettytable)
+  # Remove pip from the venv to reduce attack surface
   && rm -rf /cli/.akamai-cli/venv/cli-cloudlets/bin/pip* \
   && rm -rf /cli/.akamai-cli/venv/cli-cloudlets/lib/python*/site-packages/pip \
   && rm -rf /cli/.akamai-cli/venv/cli-cloudlets/lib/python*/site-packages/pip-* \

patches/cli-cloudlets.patch

@@ -0,0 +1,19 @@
+Subject: [PATCH] Bump prettytable to 3.17.0
+---
+Index: requirements.txt
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/requirements.txt b/requirements.txt
+--- a/requirements.txt	(revision 227cea9c6345a8878dab42e5905c0829b84344b9)
++++ b/requirements.txt	(date 1772190587146)
+@@ -5,7 +5,7 @@
+ openpyxl==3.1.2
+ pandas==2.2.2
+ pre-commit==3.3.3
+-prettytable==1.0.0
++prettytable==3.17.0
+ requests>=2.25.1,<3.0
+ rich==13.3.3
+ tabulate==0.9.0