Skip to content

Commit b8e881f

Browse files
committed
tools/docker: fix arm64 archive build
1 parent 73bef34 commit b8e881f

File tree

3 files changed

+15
-40
lines changed

3 files changed

+15
-40
lines changed

tools/docker/images/debian-11.Dockerfile

+5-10
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,11 @@ RUN ARCH=$(uname -m) \
2121
&& rm cmake-3.31.0-linux-${ARCH}.sh
2222

2323
# Install .Net
24-
# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-debian#debian-11-
25-
RUN apt-get update -qq \
26-
&& apt-get install -qq gpg apt-transport-https \
27-
&& wget -q "https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb" -O packages-microsoft-prod.deb \
28-
&& dpkg -i packages-microsoft-prod.deb \
29-
&& rm packages-microsoft-prod.deb \
30-
&& apt-get update -qq \
31-
&& apt-get install -qq dotnet-sdk-3.1 dotnet-sdk-6.0 \
32-
&& apt-get clean \
33-
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
24+
# see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install
25+
RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
26+
&& chmod a+x dotnet-install.sh \
27+
&& ./dotnet-install.sh -c 3.1 -i /usr/local/bin \
28+
&& ./dotnet-install.sh -c 6.0 -i /usr/local/bin
3429
# Trigger first run experience by running arbitrary cmd
3530
RUN dotnet --info
3631

tools/docker/images/debian-13.Dockerfile

+5-10
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,11 @@ ENTRYPOINT ["/bin/bash", "-c"]
1414
CMD ["/bin/bash"]
1515

1616
# Install .Net
17-
# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-debian#debian-11-
18-
RUN apt-get update -qq \
19-
&& apt-get install -qq gpg apt-transport-https \
20-
&& wget -q "https://packages.microsoft.com/config/debian/13/packages-microsoft-prod.deb" -O packages-microsoft-prod.deb \
21-
&& dpkg -i packages-microsoft-prod.deb \
22-
&& rm packages-microsoft-prod.deb \
23-
&& apt-get update -qq \
24-
&& apt-get install -qq dotnet-sdk-3.1 dotnet-sdk-6.0 \
25-
&& apt-get clean \
26-
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
17+
# see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install
18+
RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
19+
&& chmod a+x dotnet-install.sh \
20+
&& ./dotnet-install.sh -c 3.1 -i /usr/local/bin \
21+
&& ./dotnet-install.sh -c 6.0 -i /usr/local/bin
2722
# Trigger first run experience by running arbitrary cmd
2823
RUN dotnet --info
2924

tools/docker/images/opensuse-leap.Dockerfile

+5-20
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,11 @@ RUN zypper refresh \
2222
# Install .Net
2323
RUN zypper refresh \
2424
&& zypper install -y wget tar gzip libicu-devel
25-
RUN mkdir -p /usr/share/dotnet \
26-
&& ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
27-
## .Net 3.1
28-
## see: https://dotnet.microsoft.com/download/dotnet-core/3.1
29-
RUN dotnet_sdk_version=3.1.415 \
30-
&& wget -qO dotnet.tar.gz \
31-
"https://builds.dotnet.microsoft.com/dotnet/Sdk/${dotnet_sdk_version}/dotnet-sdk-${dotnet_sdk_version}-linux-x64.tar.gz" \
32-
&& dotnet_sha512='df7a6d1abed609c382799a8f69f129ec72ce68236b2faecf01aed4c957a40a9cfbbc9126381bf517dff3dbe0e488f1092188582701dd0fef09a68b8c5707c747' \
33-
&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \
34-
&& tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \
35-
&& rm dotnet.tar.gz
36-
## .Net 6.0
37-
## see: https://dotnet.microsoft.com/download/dotnet-core/6.0
38-
RUN dotnet_sdk_version=6.0.100 \
39-
&& wget -qO dotnet.tar.gz \
40-
"https://builds.dotnet.microsoft.com/dotnet/Sdk/${dotnet_sdk_version}/dotnet-sdk-${dotnet_sdk_version}-linux-x64.tar.gz" \
41-
&& dotnet_sha512='cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b' \
42-
&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \
43-
&& tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \
44-
&& rm dotnet.tar.gz
25+
# see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install
26+
RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
27+
&& chmod a+x dotnet-install.sh \
28+
&& ./dotnet-install.sh -c 3.1 -i /usr/local/bin \
29+
&& ./dotnet-install.sh -c 6.0 -i /usr/local/bin
4530
# Trigger first run experience by running arbitrary cmd
4631
RUN dotnet --info
4732

0 commit comments

Comments
 (0)