From 6dfdb8c0c80a6277c99faa361b73f0a0670927af Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Sun, 5 Jan 2025 21:08:05 +0000 Subject: [PATCH] Bump version Signed-off-by: Prabhu Subramanian --- ci/base-images/debian/Dockerfile.dotnet6 | 2 +- ci/base-images/debian/Dockerfile.dotnet8 | 2 +- ci/base-images/debian/Dockerfile.dotnet9 | 2 +- ci/base-images/debian/install.sh | 6 ++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ci/base-images/debian/Dockerfile.dotnet6 b/ci/base-images/debian/Dockerfile.dotnet6 index 0594180fc..f282acd07 100644 --- a/ci/base-images/debian/Dockerfile.dotnet6 +++ b/ci/base-images/debian/Dockerfile.dotnet6 @@ -22,7 +22,7 @@ COPY ci/base-images/debian/install.sh /tmp/ COPY ci/base-images/nuget /usr/lib/mono/nuget RUN apt-get update && apt-get install -y --no-install-recommends curl bash bzip2 git-core zip unzip make gawk \ - && apt-get install -y build-essential mono-devel \ + && apt-get install -y build-essential mono-devel python3 python3-pip python3-dev \ && chmod +x /tmp/install.sh \ && ./tmp/install.sh && rm /tmp/install.sh \ && node -v \ diff --git a/ci/base-images/debian/Dockerfile.dotnet8 b/ci/base-images/debian/Dockerfile.dotnet8 index 5d85bb545..a4caef51e 100644 --- a/ci/base-images/debian/Dockerfile.dotnet8 +++ b/ci/base-images/debian/Dockerfile.dotnet8 @@ -21,7 +21,7 @@ ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin: COPY ci/base-images/debian/install.sh /tmp/ RUN apt-get update && apt-get install -y --no-install-recommends curl bash bzip2 git-core zip unzip make gawk \ - && apt-get install -y build-essential \ + && apt-get install -y build-essential python3 python3-pip python3-dev \ && chmod +x /tmp/install.sh \ && ./tmp/install.sh && rm /tmp/install.sh \ && node -v \ diff --git a/ci/base-images/debian/Dockerfile.dotnet9 b/ci/base-images/debian/Dockerfile.dotnet9 index 2c9b640e7..a21686805 100644 --- a/ci/base-images/debian/Dockerfile.dotnet9 +++ b/ci/base-images/debian/Dockerfile.dotnet9 @@ -21,7 +21,7 @@ ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin: COPY ci/base-images/debian/install.sh /tmp/ RUN apt-get update && apt-get install -y --no-install-recommends curl bash bzip2 git-core zip unzip make gawk \ - && apt-get install -y build-essential \ + && apt-get install -y build-essential python3 python3-pip python3-dev \ && chmod +x /tmp/install.sh \ && ./tmp/install.sh && rm /tmp/install.sh \ && node -v \ diff --git a/ci/base-images/debian/install.sh b/ci/base-images/debian/install.sh index 4c1a3faca..0ea32bfe9 100644 --- a/ci/base-images/debian/install.sh +++ b/ci/base-images/debian/install.sh @@ -13,10 +13,8 @@ fi sdk offline enable mv /root/.sdkman/candidates/* /opt/ rm -rf /root/.sdkman -if [ x"${PYTHON_VERSION}" != "x" ]; then - python3 -m pip install --no-cache-dir --upgrade pip virtualenv - python3 -m pip install --no-cache-dir --upgrade --user pipenv poetry uv -fi +python3 -m pip install --no-cache-dir --upgrade pip virtualenv +python3 -m pip install --no-cache-dir --upgrade --user pipenv poetry uv curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash chmod +x /root/.nvm/nvm.sh source /root/.nvm/nvm.sh