From 707946e95ad14e6c366a6ae8a36527ef0ac3ba55 Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Wed, 22 Sep 2021 14:30:47 +0200 Subject: [PATCH] cmake(ci): Fix .Net dockers --- cmake/docker/opensuse/dotnet.Dockerfile | 13 +++++++------ cmake/docker/ubuntu/dotnet.Dockerfile | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cmake/docker/opensuse/dotnet.Dockerfile b/cmake/docker/opensuse/dotnet.Dockerfile index 23c0a6b745..c2379ebea8 100644 --- a/cmake/docker/opensuse/dotnet.Dockerfile +++ b/cmake/docker/opensuse/dotnet.Dockerfile @@ -1,26 +1,27 @@ FROM ortools/cmake:opensuse_swig AS env RUN zypper update -y \ && zypper install -y wget tar gzip libicu-devel + # .NET install +RUN mkdir -p /usr/share/dotnet \ +&& ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet + # see: https://dotnet.microsoft.com/download/dotnet-core/3.1 -RUN dotnet_sdk_version=3.1.404 \ +RUN dotnet_sdk_version=3.1.413 \ && wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ -&& dotnet_sha512='94d8eca3b4e2e6c36135794330ab196c621aee8392c2545a19a991222e804027f300d8efd152e9e4893c4c610d6be8eef195e30e6f6675285755df1ea49d3605' \ +&& dotnet_sha512='2a0824f11aba0b79d3f9a36af0395649bc9b4137e61b240a48dccb671df0a5b8c2086054f8e495430b7ed6c344bb3f27ac3dfda5967d863718a6dadeca951a83' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ -&& mkdir -p /usr/share/dotnet \ && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \ -&& ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ && rm dotnet.tar.gz # Trigger first run experience by running arbitrary cmd RUN dotnet --info + # see: https://dotnet.microsoft.com/download/dotnet-core/5.0 RUN dotnet_sdk_version=5.0.401 \ && wget -O dotnet.tar.gz https://download.visualstudio.microsoft.com/download/pr/5972698f-ba44-4664-9c50-bdc69ca70fb7/1cf7d94425d8dd4d5789dfa978d61475/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ && dotnet_sha512='a444d44007709ceb68d8f72dec0531e17f85f800efc0007ace4fa66ba27f095066930e6c6defcd2f85cdedea2fec25e163f5da461c1c2b8563e5cd7cb47091e0' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ -&& mkdir -p /usr/share/dotnet \ && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \ -&& ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet \ && rm dotnet.tar.gz # Trigger first run experience by running arbitrary cmd RUN dotnet --info diff --git a/cmake/docker/ubuntu/dotnet.Dockerfile b/cmake/docker/ubuntu/dotnet.Dockerfile index 486913c666..13be29b905 100644 --- a/cmake/docker/ubuntu/dotnet.Dockerfile +++ b/cmake/docker/ubuntu/dotnet.Dockerfile @@ -2,7 +2,7 @@ FROM ortools/cmake:ubuntu_swig AS env # see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-ubuntu RUN apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -yq wget apt-transport-https \ -&& wget -q https://packages.microsoft.com/config/ubuntu/20.10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ +&& wget -q https://packages.microsoft.com/config/ubuntu/21.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ && dpkg -i packages-microsoft-prod.deb \ && apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -yq dotnet-sdk-3.1 dotnet-sdk-5.0 \