diff --git a/cmake/docker/fedora/dotnet.Dockerfile b/cmake/docker/fedora/dotnet.Dockerfile index f8c85c8841..34ca86f7f7 100644 --- a/cmake/docker/fedora/dotnet.Dockerfile +++ b/cmake/docker/fedora/dotnet.Dockerfile @@ -1,23 +1,12 @@ FROM ortools/cmake:fedora_swig AS env + # see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-fedora 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 # 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 COPY . . diff --git a/makefiles/docker/fedora/dotnet.Dockerfile b/makefiles/docker/fedora/dotnet.Dockerfile index 7e6aabcee8..e2b7046b91 100644 --- a/makefiles/docker/fedora/dotnet.Dockerfile +++ b/makefiles/docker/fedora/dotnet.Dockerfile @@ -1,23 +1,12 @@ FROM ortools/make:fedora_swig AS env -# see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-fedora#fedora-32- + +# see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-fedora RUN dnf -y update \ -&& dnf -y install dotnet-sdk-3.1 dotnet-sdk-5.0 \ +&& dnf -y install dotnet-sdk-3.1 dotnet-sdk-6.0 \ && dnf clean all # 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 COPY . .