From 8b2fa98d275f56e0ee28d6de415490ad88b52d57 Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Wed, 2 Mar 2022 08:41:07 +0100 Subject: [PATCH] ci: use distro dotnet-sdk-6.0 on Centos --- cmake/docker/centos/dotnet.Dockerfile | 13 +------------ makefiles/docker/centos/dotnet.Dockerfile | 13 +------------ tools/docker/amd64/centos-8.Dockerfile | 13 +------------ 3 files changed, 3 insertions(+), 36 deletions(-) diff --git a/cmake/docker/centos/dotnet.Dockerfile b/cmake/docker/centos/dotnet.Dockerfile index 3394943c2c..e2af43c7a6 100644 --- a/cmake/docker/centos/dotnet.Dockerfile +++ b/cmake/docker/centos/dotnet.Dockerfile @@ -1,23 +1,12 @@ FROM ortools/cmake:centos_swig AS env # see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-centos8 RUN dnf -y update \ -&& dnf -y install dotnet-sdk-3.1 \ +&& dnf -y install dotnet-sdk-3.1 dotnet-sdk-6.0 \ && dnf clean all \ && rm -rf /var/cache/dnf # Trigger first run experience by running arbitrary cmd RUN dotnet --info -# see: https://dotnet.microsoft.com/download/dotnet-core/6.0 -RUN dotnet_sdk_version=6.0.100 \ -&& wget -qO dotnet.tar.gz \ -"https://dotnetcli.azureedge.net/dotnet/Sdk/${dotnet_sdk_version}/dotnet-sdk-${dotnet_sdk_version}-linux-x64.tar.gz" \ -&& dotnet_sha512='cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b' \ -&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ -&& tar -C /usr/lib64/dotnet -oxzf dotnet.tar.gz \ -&& rm dotnet.tar.gz -# Trigger first run experience by running arbitrary cmd -RUN dotnet --info - # Add the library src to our build env FROM env AS devel WORKDIR /home/project diff --git a/makefiles/docker/centos/dotnet.Dockerfile b/makefiles/docker/centos/dotnet.Dockerfile index 44e7781c8d..36de504d78 100644 --- a/makefiles/docker/centos/dotnet.Dockerfile +++ b/makefiles/docker/centos/dotnet.Dockerfile @@ -1,23 +1,12 @@ FROM ortools/make:centos_swig AS env # see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-centos8 RUN dnf -y update \ -&& dnf -y install dotnet-sdk-3.1 \ +&& dnf -y install dotnet-sdk-3.1 dotnet-sdk-6.0 \ && dnf clean all \ && rm -rf /var/cache/dnf # Trigger first run experience by running arbitrary cmd RUN dotnet --info -# see: https://dotnet.microsoft.com/download/dotnet-core/6.0 -RUN dotnet_sdk_version=6.0.100 \ -&& wget -qO dotnet.tar.gz \ -"https://dotnetcli.azureedge.net/dotnet/Sdk/${dotnet_sdk_version}/dotnet-sdk-${dotnet_sdk_version}-linux-x64.tar.gz" \ -&& dotnet_sha512='cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b' \ -&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ -&& tar -C /usr/lib64/dotnet -oxzf dotnet.tar.gz \ -&& rm dotnet.tar.gz -# Trigger first run experience by running arbitrary cmd -RUN dotnet --info - # Add the library src to our build env FROM env AS devel WORKDIR /home/project diff --git a/tools/docker/amd64/centos-8.Dockerfile b/tools/docker/amd64/centos-8.Dockerfile index 8ca7961711..f59fab1621 100644 --- a/tools/docker/amd64/centos-8.Dockerfile +++ b/tools/docker/amd64/centos-8.Dockerfile @@ -34,23 +34,12 @@ ENV JAVA_HOME=/usr/lib/jvm/java # Install dotnet # see https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-centos8 RUN dnf -y update \ -&& dnf -y install dotnet-sdk-3.1 \ +&& dnf -y install dotnet-sdk-3.1 dotnet-sdk-6.0 \ && dnf clean all \ && rm -rf /var/cache/dnf # Trigger first run experience by running arbitrary cmd RUN dotnet --info -# see: https://dotnet.microsoft.com/download/dotnet-core/6.0 -RUN dotnet_sdk_version=6.0.100 \ -&& wget -qO dotnet.tar.gz \ -"https://dotnetcli.azureedge.net/dotnet/Sdk/${dotnet_sdk_version}/dotnet-sdk-${dotnet_sdk_version}-linux-x64.tar.gz" \ -&& dotnet_sha512='cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b' \ -&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ -&& tar -C /usr/lib64/dotnet -oxzf dotnet.tar.gz \ -&& rm dotnet.tar.gz -# Trigger first run experience by running arbitrary cmd -RUN dotnet --info - ENV TZ=America/Los_Angeles RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone