From c296ec109827f5d5d53115c52cdcb8218aac3cb5 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Thu, 30 May 2024 09:44:36 +0200 Subject: [PATCH] tools/docker: fix debian-12 --- tools/docker/images/debian-12.Dockerfile | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/tools/docker/images/debian-12.Dockerfile b/tools/docker/images/debian-12.Dockerfile index 89f23d52a1..1662714de9 100644 --- a/tools/docker/images/debian-12.Dockerfile +++ b/tools/docker/images/debian-12.Dockerfile @@ -7,7 +7,7 @@ FROM debian:12 AS env RUN apt-get update -qq \ && apt-get install -qq \ git pkg-config wget make autoconf libtool zlib1g-dev gawk g++ curl subversion \ - swig lsb-release \ + swig lsb-release libicu-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ENTRYPOINT ["/bin/bash", "-c"] @@ -21,16 +21,11 @@ RUN ARCH=$(uname -m) \ && rm cmake-3.28.3-linux-${ARCH}.sh # Install .Net -# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-debian#debian-11- -RUN apt-get update -qq \ -&& apt-get install -qq gpg apt-transport-https \ -&& wget -q "https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb" -O packages-microsoft-prod.deb \ -&& dpkg -i packages-microsoft-prod.deb \ -&& rm packages-microsoft-prod.deb \ -&& apt-get update -qq \ -&& apt-get install -qq dotnet-sdk-3.1 dotnet-sdk-6.0 \ -&& apt-get clean \ -&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +# see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install +RUN wget -q "https://dot.net/v1/dotnet-install.sh" \ +&& chmod a+x dotnet-install.sh \ +&& ./dotnet-install.sh -c 3.1 -i /usr/local/bin \ +&& ./dotnet-install.sh -c 6.0 -i /usr/local/bin # Trigger first run experience by running arbitrary cmd RUN dotnet --info @@ -46,7 +41,8 @@ RUN apt-get update -qq \ && apt-get install -qq python3 python3-dev python3-pip python3-venv \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN python3 -m pip install absl-py mypy mypy-protobuf +RUN python3 -m pip install --break-system-package \ + absl-py mypy mypy-protobuf ENV TZ=America/Los_Angeles RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone