From da453b992031f4d6a5138a77d63eb3eea0a28bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 7 Jan 2025 14:48:18 +0200 Subject: [PATCH] docker: Stop installing python3-distutils In Ubuntu 24.04, this package is no longer available. However, this package probably never actually was needed anyway, and was probably only provided as a convenience for users of the docker image. --- Dockerfile | 2 +- Dockerfile.dev | 2 +- Dockerfile.system-clang | 2 +- Dockerfile.toolchain | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0fba921..2685396 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update -qq && \ DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \ git wget bzip2 file unzip libtool pkg-config cmake build-essential \ - automake yasm gettext autopoint vim-tiny python3 python3-distutils \ + automake yasm gettext autopoint vim-tiny python3 \ ninja-build ca-certificates curl less zip && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile.dev b/Dockerfile.dev index f0eb305..cbabe75 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update -qq && \ DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \ git wget bzip2 file unzip libtool pkg-config cmake build-essential \ - automake yasm gettext autopoint vim-tiny python3 python3-distutils \ + automake yasm gettext autopoint vim-tiny python3 \ ninja-build ca-certificates curl less zip && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile.system-clang b/Dockerfile.system-clang index bbb19a7..44e281a 100644 --- a/Dockerfile.system-clang +++ b/Dockerfile.system-clang @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update -qq && \ DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \ git wget bzip2 file unzip libtool pkg-config cmake build-essential \ - automake yasm gettext autopoint vim-tiny python3 python3-distutils \ + automake yasm gettext autopoint vim-tiny python3 \ ninja-build ca-certificates curl less zip && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile.toolchain b/Dockerfile.toolchain index 344a858..3586023 100644 --- a/Dockerfile.toolchain +++ b/Dockerfile.toolchain @@ -3,7 +3,7 @@ FROM ubuntu:22.04 RUN apt-get update -qq && \ DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \ git wget bzip2 file unzip libtool pkg-config cmake build-essential \ - automake yasm gettext autopoint vim-tiny python3 python3-distutils \ + automake yasm gettext autopoint vim-tiny python3 \ ninja-build ca-certificates curl less zip && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/*