From 06a3bdb966373db8f413d9d38284790cfad98b73 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Sun, 5 Jan 2025 21:16:14 +0000 Subject: [PATCH] Python 3.9 tweaks Signed-off-by: Prabhu Subramanian --- ci/base-images/debian/Dockerfile.dotnet6 | 3 +-- ci/base-images/opensuse/Dockerfile.python39 | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/base-images/debian/Dockerfile.dotnet6 b/ci/base-images/debian/Dockerfile.dotnet6 index f282acd07..a1feb8b25 100644 --- a/ci/base-images/debian/Dockerfile.dotnet6 +++ b/ci/base-images/debian/Dockerfile.dotnet6 @@ -19,7 +19,6 @@ ENV JAVA_VERSION=$JAVA_VERSION \ ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:/usr/local/bin:/root/.local/bin: 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 python3 python3-pip python3-dev \ @@ -31,7 +30,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends curl bash bzip2 && echo -e '#!/bin/sh\nexec /usr/bin/mono /usr/lib/mono/nuget/nuget.exe "$@"\n' > /usr/bin/nuget \ && chmod +x /usr/bin/nuget \ && rm -rf /usr/lib/mono/nuget \ - && nuget help \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* +COPY ci/base-images/nuget /usr/lib/mono/nuget CMD /bin/bash diff --git a/ci/base-images/opensuse/Dockerfile.python39 b/ci/base-images/opensuse/Dockerfile.python39 index c91d14856..5bc375f9e 100644 --- a/ci/base-images/opensuse/Dockerfile.python39 +++ b/ci/base-images/opensuse/Dockerfile.python39 @@ -21,7 +21,7 @@ RUN set -e; \ ;; \ *) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \ esac \ - && zypper refresh && zypper --non-interactive dup && zypper --non-interactive install -l --no-recommends gcc12 gcc12-c++ gcc12-fortran \ + && zypper --non-interactive install -l --no-recommends gcc12 gcc12-c++ gcc12-fortran \ python39 python39-devel python39-pip findutils java-23-openjdk-devel \ bzip2 git-core wget zip unzip make gawk nodejs22 npm22 nodejs22-devel libxml2-devel \ && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 10 \