From 91ed531e4d837d0a23dc27751ed882098d78deca Mon Sep 17 00:00:00 2001
From: Roland Dobai <roland.dobai@espressif.com>
Date: Thu, 27 Feb 2025 12:04:43 +0100
Subject: [PATCH] fixup

---
 .github/workflows/docker.yml | 6 ++----
 tools/docker/Dockerfile      | 7 +------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d72be80617..5abbd15269 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -48,11 +48,9 @@ jobs:
         with:
           image: tonistiigi/binfmt:qemu-v7.0.0-28
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          cache-binary: false
+        uses: docker/setup-buildx-action@v2
       - name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v3
         with:
           context: tools/docker
           push: false
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 8ec02f47c7..5c6f33a1a5 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -2,11 +2,6 @@ FROM ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-# Unpacking libc-bin (2.35-0ubuntu3.9) over (2.35-0ubuntu3.8)
-# Errors were encountered while processing: libc-bin
-RUN apt-get update \
- && apt-get install -y --no-install-recommends libc-bin
-
 RUN : \
   && apt-get update \
   && apt-get install -y \
@@ -34,7 +29,6 @@ RUN : \
     ninja-build \
     python3 \
     python3-venv \
-    python-is-python3 \
     ruby \
     unzip \
     wget \
@@ -42,6 +36,7 @@ RUN : \
     zip \
   && apt-get autoremove -y \
   && rm -rf /var/lib/apt/lists/* \
+  && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \
   && :
 
 # To build the image for a branch or a tag of IDF, pass --build-arg IDF_CLONE_BRANCH_OR_TAG=name.