Skip to content

Commit 0b9f68c

Browse files
Add Ubuntu 20.04 arm64 support (#1056)
1 parent 0120d1d commit 0b9f68c

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

src/ubuntu/20.04/amd64/Dockerfile renamed to src/ubuntu/20.04/Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ RUN apt-get update \
3030
# .NET SDK MSBuild requires US.UTF-8 locale to execute tasks
3131
RUN locale-gen en_US.UTF-8
3232

33-
# Install Azure CLI
34-
RUN curl -L -o azure-cli_focal_all.deb https://aka.ms/InstallAzureCliFocalEdge \
35-
&& dpkg -i azure-cli_focal_all.deb
33+
# Install Azure CLI - https://learn.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt#option-1-install-with-one-command
34+
RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash \
35+
# Install script does apt-get update and install, so we need to clean up after it.
36+
&& rm -rf /var/lib/apt/lists/*
3637

3738
# Runtime dependencies
3839
RUN apt-get update \

src/ubuntu/manifest.json

+16-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
{
9797
"platforms": [
9898
{
99-
"dockerfile": "src/ubuntu/20.04/amd64",
99+
"dockerfile": "src/ubuntu/20.04",
100100
"os": "linux",
101101
"osVersion": "focal",
102102
"tags": {
@@ -109,6 +109,21 @@
109109
}
110110
]
111111
},
112+
{
113+
"platforms": [
114+
{
115+
"architecture": "arm64",
116+
"dockerfile": "src/ubuntu/20.04",
117+
"os": "linux",
118+
"osVersion": "focal",
119+
"tags": {
120+
"ubuntu-20.04-arm64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
121+
"ubuntu-20.04-arm64$(FloatingTagSuffix)": {}
122+
},
123+
"variant": "v8"
124+
}
125+
]
126+
},
112127
{
113128
"platforms": [
114129
{

0 commit comments

Comments
 (0)