diff --git a/cmake/docker/alpine/dotnet.Dockerfile b/cmake/docker/alpine/dotnet.Dockerfile index ddc72c4801..fc0cf30351 100644 --- a/cmake/docker/alpine/dotnet.Dockerfile +++ b/cmake/docker/alpine/dotnet.Dockerfile @@ -1,19 +1,7 @@ FROM ortools/cmake:alpine_swig AS env # .NET install -RUN apk add --no-cache wget icu-libs libintl \ -&& mkdir -p /usr/share/dotnet \ -&& ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet - -## .Net 8.0 -## see: https://dotnet.microsoft.com/download/dotnet-core/8.0 -RUN dotnet_sdk_version=8.0.408 \ -&& wget -qO dotnet.tar.gz \ -"https://dotnetcli.azureedge.net/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-${dotnet_sdk_version}-linux-musl-x64.tar.gz" \ -&& dotnet_sha512='0ab0c0d52985bde69b594454b5e1d9e1a6e003159656ee2972058d2960cfb0968dbe4d470d8eb21dcea41ff594976520e189a8e13afc44a419ca08e456df36e1' \ -&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ -&& tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \ -&& rm dotnet.tar.gz +RUN apk add --no-cache dotnet8-sdk # Trigger first run experience by running arbitrary cmd RUN dotnet --info diff --git a/makefiles/docker/alpine/dotnet.Dockerfile b/makefiles/docker/alpine/dotnet.Dockerfile index a3a6973d03..9924db424f 100644 --- a/makefiles/docker/alpine/dotnet.Dockerfile +++ b/makefiles/docker/alpine/dotnet.Dockerfile @@ -1,19 +1,7 @@ FROM ortools/make:alpine_swig AS env -# Install .Net -RUN apk add --no-cache wget icu-libs libintl \ -&& mkdir -p /usr/share/dotnet \ -&& ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet - -## .Net 6.0 -## see: https://dotnet.microsoft.com/download/dotnet-core/6.0 -RUN dotnet_sdk_version=6.0.405 \ -&& wget -qO dotnet.tar.gz \ -"https://dotnetcli.azureedge.net/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-${dotnet_sdk_version}-linux-musl-x64.tar.gz" \ -&& dotnet_sha512='ca98ebc5858339c5ce4164f5f5932a5bf8aae9f13d54adf382a41f5e6d1302df278bd7e218ecc2f651dcf67e705c40c43347cd33956732c6bd88d3b3d2881b84' \ -&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ -&& tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \ -&& rm dotnet.tar.gz +# .NET install +RUN apk add --no-cache dotnet8-sdk # Trigger first run experience by running arbitrary cmd RUN dotnet --info diff --git a/tools/docker/images/alpine-edge.Dockerfile b/tools/docker/images/alpine-edge.Dockerfile index 5a76672b2e..96c04328c6 100644 --- a/tools/docker/images/alpine-edge.Dockerfile +++ b/tools/docker/images/alpine-edge.Dockerfile @@ -13,31 +13,8 @@ CMD ["/bin/sh"] # Install Swig RUN apk add --no-cache swig -# Install .Net -RUN apk add --no-cache wget icu-libs libintl \ -&& mkdir -p /usr/share/dotnet \ -&& ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet - -## .Net 3.1 -## see: https://dotnet.microsoft.com/en-us/download/dotnet/3.1 -RUN dotnet_sdk_version=3.1.415 \ -&& wget -qO dotnet.tar.gz \ -"https://builds.dotnet.microsoft.com/dotnet/Sdk/${dotnet_sdk_version}/dotnet-sdk-${dotnet_sdk_version}-linux-musl-x64.tar.gz" \ -&& dotnet_sha512='20297eb436db2fe0cb3d8edfe4ad5b7c7871116616843314830533471a344f0ca943fbc5f92685113afc331a64c90f271245a36be1c232c364add936dd06d13d' \ -&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ -&& tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \ -&& rm dotnet.tar.gz - -## .Net 8.0 -## see: https://dotnet.microsoft.com/en-us/download/dotnet/8.0 -RUN dotnet_sdk_version=8.0.408 \ -&& wget -qO dotnet.tar.gz \ -"https://dotnetcli.azureedge.net/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-${dotnet_sdk_version}-linux-musl-x64.tar.gz" \ -&& dotnet_sha512='0ab0c0d52985bde69b594454b5e1d9e1a6e003159656ee2972058d2960cfb0968dbe4d470d8eb21dcea41ff594976520e189a8e13afc44a419ca08e456df36e1' \ -&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ -&& tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \ -&& rm dotnet.tar.gz - +# .NET install +RUN apk add --no-cache dotnet8-sdk # Trigger first run experience by running arbitrary cmd RUN dotnet --info diff --git a/tools/docker/test/alpine-edge/dotnet.Dockerfile b/tools/docker/test/alpine-edge/dotnet.Dockerfile index 1e18e1a67b..788bc91d0e 100644 --- a/tools/docker/test/alpine-edge/dotnet.Dockerfile +++ b/tools/docker/test/alpine-edge/dotnet.Dockerfile @@ -10,31 +10,8 @@ RUN apk add --no-cache git build-base linux-headers make ENTRYPOINT ["/bin/sh", "-c"] CMD ["/bin/sh"] -# Install .Net -RUN apk add --no-cache wget icu-libs libintl \ -&& mkdir -p /usr/share/dotnet \ -&& ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet - -## .Net 3.1 -## see: https://dotnet.microsoft.com/download/dotnet-core/3.1 -RUN dotnet_sdk_version=3.1.415 \ -&& wget -qO dotnet.tar.gz \ -"https://builds.dotnet.microsoft.com/dotnet/Sdk/${dotnet_sdk_version}/dotnet-sdk-${dotnet_sdk_version}-linux-musl-x64.tar.gz" \ -&& dotnet_sha512='20297eb436db2fe0cb3d8edfe4ad5b7c7871116616843314830533471a344f0ca943fbc5f92685113afc331a64c90f271245a36be1c232c364add936dd06d13d' \ -&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ -&& tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \ -&& rm dotnet.tar.gz - -## .Net 8.0 -## see: https://dotnet.microsoft.com/download/dotnet-core/8.0 -RUN dotnet_sdk_version=8.0.408 \ -&& wget -qO dotnet.tar.gz \ -"https://dotnetcli.azureedge.net/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-${dotnet_sdk_version}-linux-musl-x64.tar.gz" \ -&& dotnet_sha512='0ab0c0d52985bde69b594454b5e1d9e1a6e003159656ee2972058d2960cfb0968dbe4d470d8eb21dcea41ff594976520e189a8e13afc44a419ca08e456df36e1' \ -&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ -&& tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \ -&& rm dotnet.tar.gz - +# .NET install +RUN apk add --no-cache dotnet8-sdk # Trigger first run experience by running arbitrary cmd RUN dotnet --info