From 1a4ccc1f8ab0bf9dce92c29bc8d55180ce77c536 Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Mon, 4 May 2020 13:41:39 +0200 Subject: [PATCH] ci: Update centos dotnet-package Microsoft has fixed their packages ! --- cmake/docker/centos/dotnet.Dockerfile | 18 +++++------------- makefiles/docker/centos/dotnet.Dockerfile | 18 +++++------------- tools/docker/centos-8.Dockerfile | 18 +++++------------- tools/docker/test/centos-8/dotnet.Dockerfile | 18 +++++------------- 4 files changed, 20 insertions(+), 52 deletions(-) diff --git a/cmake/docker/centos/dotnet.Dockerfile b/cmake/docker/centos/dotnet.Dockerfile index 91b72a9bee..845f192395 100644 --- a/cmake/docker/centos/dotnet.Dockerfile +++ b/cmake/docker/centos/dotnet.Dockerfile @@ -1,17 +1,9 @@ FROM ortools/cmake:centos_swig AS env -# Currently centos package is broken -# see: https://developercommunity.visualstudio.com/content/problem/990297/centos-8-dotnet-sdk-dont-provide-the-sdk.html -## see https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-centos7 -#RUN rpm -Uvh "https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm" \ -#&& yum -y update \ -#&& yum -y install dotnet-sdk-3.1 \ -#&& yum clean all \ -#&& rm -rf /var/cache/yum -RUN wget "https://dotnet.microsoft.com/download/dotnet-core/scripts/v1/dotnet-install.sh" \ -&& chmod a+x dotnet-install.sh \ -&& ./dotnet-install.sh \ -&& rm dotnet-install.sh -ENV PATH=/root/.dotnet:$PATH +# see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-centos8 +RUN yum -y update \ +&& yum -y install dotnet-sdk-3.1 \ +&& yum clean all \ +&& rm -rf /var/cache/yum # Trigger first run experience by running arbitrary cmd RUN dotnet --info diff --git a/makefiles/docker/centos/dotnet.Dockerfile b/makefiles/docker/centos/dotnet.Dockerfile index d415db52a1..20279bc45b 100644 --- a/makefiles/docker/centos/dotnet.Dockerfile +++ b/makefiles/docker/centos/dotnet.Dockerfile @@ -1,17 +1,9 @@ FROM ortools/make:centos_swig AS env -# Currently centos package is broken -# see: https://developercommunity.visualstudio.com/content/problem/990297/centos-8-dotnet-sdk-dont-provide-the-sdk.html -## see https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-centos7 -#RUN rpm -Uvh "https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm" \ -#&& yum -y update \ -#&& yum -y install dotnet-sdk-3.1 \ -#&& yum clean all \ -#&& rm -rf /var/cache/yum -RUN wget "https://dotnet.microsoft.com/download/dotnet-core/scripts/v1/dotnet-install.sh" \ -&& chmod a+x dotnet-install.sh \ -&& ./dotnet-install.sh \ -&& rm dotnet-install.sh -ENV PATH=/root/.dotnet:$PATH +# see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-centos8 +RUN yum -y update \ +&& yum -y install dotnet-sdk-3.1 \ +&& yum clean all \ +&& rm -rf /var/cache/yum # Trigger first run experience by running arbitrary cmd RUN dotnet --info diff --git a/tools/docker/centos-8.Dockerfile b/tools/docker/centos-8.Dockerfile index da539ebcdf..994c553585 100644 --- a/tools/docker/centos-8.Dockerfile +++ b/tools/docker/centos-8.Dockerfile @@ -23,19 +23,11 @@ RUN yum -y update \ && rm -rf /var/cache/yum # Install dotnet -# Currently centos package is broken -# see: https://developercommunity.visualstudio.com/content/problem/990297/centos-8-dotnet-sdk-dont-provide-the-sdk.html -## see https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-centos7 -#RUN rpm -Uvh "https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm" \ -#&& yum -y update \ -#&& yum -y install dotnet-sdk-3.1 \ -#&& yum clean all \ -#&& rm -rf /var/cache/yum -RUN wget "https://dotnet.microsoft.com/download/dotnet-core/scripts/v1/dotnet-install.sh" \ -&& chmod a+x dotnet-install.sh \ -&& ./dotnet-install.sh \ -&& rm dotnet-install.sh -ENV PATH=/root/.dotnet:$PATH +# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-centos8 +RUN yum -y update \ +&& yum -y install dotnet-sdk-3.1 \ +&& yum clean all \ +&& rm -rf /var/cache/yum # Trigger first run experience by running arbitrary cmd RUN dotnet --info diff --git a/tools/docker/test/centos-8/dotnet.Dockerfile b/tools/docker/test/centos-8/dotnet.Dockerfile index 1e806fd263..f94f71b026 100644 --- a/tools/docker/test/centos-8/dotnet.Dockerfile +++ b/tools/docker/test/centos-8/dotnet.Dockerfile @@ -8,19 +8,11 @@ RUN yum -y update \ && rm -rf /var/cache/yum # Install dotnet -# Currently centos package is broken -# see: https://developercommunity.visualstudio.com/content/problem/990297/centos-8-dotnet-sdk-dont-provide-the-sdk.html -## see https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-centos7 -#RUN rpm -Uvh "https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm" \ -#&& yum -y update \ -#&& yum -y install dotnet-sdk-3.1 \ -#&& yum clean all \ -#&& rm -rf /var/cache/yum -RUN wget "https://dotnet.microsoft.com/download/dotnet-core/scripts/v1/dotnet-install.sh" \ -&& chmod a+x dotnet-install.sh \ -&& ./dotnet-install.sh \ -&& rm dotnet-install.sh -ENV PATH=/root/.dotnet:$PATH +# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-centos8 +RUN yum -y update \ +&& yum -y install dotnet-sdk-3.1 \ +&& yum clean all \ +&& rm -rf /var/cache/yum # Trigger first run experience by running arbitrary cmd RUN dotnet --info