Skip to content

Commit b912ebf

Browse files
committed
dotnet: get rid of last remaining .Net 6.0
1 parent 77c2170 commit b912ebf

File tree

5 files changed

+11
-17
lines changed

5 files changed

+11
-17
lines changed

makefiles/docker/debian/dotnet.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN apt-get update -qq \
66
&& dpkg -i packages-microsoft-prod.deb \
77
&& rm packages-microsoft-prod.deb \
88
&& apt-get update -qq \
9-
&& apt-get install -yq dotnet-sdk-6.0 \
9+
&& apt-get install -yq dotnet-sdk-8.0 \
1010
&& apt-get clean \
1111
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
1212
# Trigger first run experience by running arbitrary cmd

makefiles/docker/fedora/dotnet.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM ortools/make:fedora_swig AS env
22

33
# see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-fedora
44
RUN dnf -y update \
5-
&& dnf -y install dotnet-sdk-6.0 \
5+
&& dnf -y install dotnet-sdk-8.0 \
66
&& dnf clean all
77
# Trigger first run experience by running arbitrary cmd
88
RUN dotnet --info

makefiles/docker/opensuse/dotnet.Dockerfile

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
FROM ortools/make:opensuse_swig AS env
22

3-
# Install .Net
3+
# .NET install
44
# see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-opensuse
55
RUN zypper refresh \
6-
&& zypper install -y wget tar gzip libicu-devel
7-
RUN mkdir -p /usr/share/dotnet \
8-
&& ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
6+
&& zypper install -y wget tar awk gzip libicu-devel findutils
97

10-
## .Net 6.0
11-
## see: https://dotnet.microsoft.com/download/dotnet-core/6.0
12-
RUN dotnet_sdk_version=6.0.100 \
13-
&& wget -qO dotnet.tar.gz \
14-
"https://dotnetcli.azureedge.net/dotnet/Sdk/${dotnet_sdk_version}/dotnet-sdk-${dotnet_sdk_version}-linux-x64.tar.gz" \
15-
&& dotnet_sha512='cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b' \
16-
&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \
17-
&& tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \
18-
&& rm dotnet.tar.gz
8+
## .Net 8.0
9+
# see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install
10+
RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
11+
&& chmod a+x dotnet-install.sh \
12+
&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin
1913
# Trigger first run experience by running arbitrary cmd
2014
RUN dotnet --info
2115

tools/release/amd64.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CMD ["/usr/bin/bash"]
2525
RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
2626
&& chmod a+x dotnet-install.sh \
2727
&& ./dotnet-install.sh -c 3.1 -i /usr/local/bin \
28-
&& ./dotnet-install.sh -c 6.0 -i /usr/local/bin
28+
&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin
2929
# Trigger first run experience by running arbitrary cmd
3030
RUN dotnet --info
3131

tools/release/arm64.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ CMD ["/usr/bin/bash"]
2828
RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
2929
&& chmod a+x dotnet-install.sh \
3030
&& ./dotnet-install.sh -c 3.1 -i /usr/local/bin \
31-
&& ./dotnet-install.sh -c 6.0 -i /usr/local/bin
31+
&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin
3232
# Trigger first run experience by running arbitrary cmd
3333
#RUN objdump -p /lib64/libstdc++.so.6
3434
#RUN g++ --version

0 commit comments

Comments
 (0)