Skip to content

Commit bde3c9e

Browse files
sbomersbomer
authored
Fix tag names for Azure Linux images (#1262)
1 parent 6ec8bfc commit bde3c9e

File tree

29 files changed

+95
-76
lines changed

29 files changed

+95
-76
lines changed

‎README.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,29 @@ The images produced from the Dockerfiles in this repository are published to the
1212

1313
## How to identify an image
1414

15-
The tag format used by the images from this repository is `mcr.microsoft.com/dotnet-buildtools/prereqs:<os-name>-<os-version>-<variant>-<architecture>`
15+
There are two tag formats used by the images from this repository. Most of the images follow the format `mcr.microsoft.com/dotnet-buildtools/prereqs:<os-name>-<os-version>-<variant>-<architecture>`.
1616

1717
- `<os-name>` - Name of the Linux distribution or Windows OS the image is based on
1818
- `<os-version>` - Version of the OS
1919
- `<variant>` - Name describing the specialization purpose of the image.
2020
Often special dependencies are needed for certain parts of the product.
2121
It can be beneficial to separate these dependencies into a separate Dockerfile/image.
22-
- `<architecture>` - Architecture of the OS (amd64 shall be implied if not specified).
22+
- `<architecture>` - Architecture of the OS.
2323

2424
Examples:
2525

26-
- mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20
26+
- mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-amd64
2727
- mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-helix-arm64v8
2828

29+
The cross-compilation images follow the format `mcr.microsoft.com/dotnet-buildtools/prereqs:<os-name>-<os-version>-<variant>-cross-<target>`. These are all implicitly amd64 images.
30+
31+
- `<target>` - Specifies the target for cross-compilation, including the targeted architecture and libc variant (glibc if not specified).
32+
33+
Examples:
34+
35+
- mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-cross-arm64
36+
- mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-amd64-alpine
37+
2938
## How to modify or create a new image
3039

3140
There will be a need for modifying existing Dockerfiles or creating new ones.
@@ -165,8 +174,9 @@ From this commit of the `image-info.dotnet-dotnet-buildtools-prereqs-docker-main
165174

166175
### Source Folder Structure
167176

168-
The folder structure used in [src](./src) aligns with the tagging convention - `<os-name>-<os-version>-<variant>-<architecture>`.
169-
For example, the Dockerfile used to produce the `mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20` image is stored in the [src/alpine/3.20/amd64](./src/alpine/3.20/amd64) folder.
177+
The folder structure used in [src](./src) aligns with the tagging convention - `<os-name>-<os-version>-<variant>-<architecture>` or `<os-name>-<os-version>-<variant>-cross-<target>`.
178+
For example, the Dockerfile used to produce the `mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-amd64` image is stored in the [src/alpine/3.20/amd64](./src/alpine/3.20/amd64) folder.
179+
The Dockerfile used to produce the `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-cross-arm64` image is stored in the [src/azurelinux/3.0/net8.0/cross/arm64](./src/azurelinux/3.0/net8.0/cross/arm64) folder.
170180

171181
If a Dockerfile is shared across multiple architectures, then the `<architecture>` folder should be omitted.
172182
For example, the [src\alpine\3.20\helix\Dockerfile](./src/alpine/3.20/helix/Dockerfile) is built for all supported architectures (amd64, arm64 and arm) therefore there is no architecture folder in its path.
@@ -189,7 +199,7 @@ Each Dockerfile will have an entry that looks like the following.
189199
"os": "linux",
190200
"osVersion": "alpine3.20",
191201
"tags": {
192-
"alpine-3.20": {}
202+
"alpine-3.20-amd64": {}
193203
}
194204
}
195205
]

‎src/alpine/manifest.json

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"os": "linux",
1111
"osVersion": "alpine3.17",
1212
"tags": {
13-
"alpine-3.17": {}
13+
"alpine-3.17": {},
14+
"alpine-3.17-amd64": {}
1415
}
1516
}
1617
]
@@ -104,7 +105,8 @@
104105
"os": "linux",
105106
"osVersion": "alpine3.18",
106107
"tags": {
107-
"alpine-3.18": {}
108+
"alpine-3.18": {},
109+
"alpine-3.18-amd64": {}
108110
}
109111
}
110112
]
@@ -116,7 +118,8 @@
116118
"os": "linux",
117119
"osVersion": "alpine3.18",
118120
"tags": {
119-
"alpine-3.18-WithNode": {}
121+
"alpine-3.18-WithNode": {},
122+
"alpine-3.18-WithNode-amd64": {}
120123
}
121124
}
122125
]
@@ -128,7 +131,8 @@
128131
"os": "linux",
129132
"osVersion": "alpine3.19",
130133
"tags": {
131-
"alpine-3.19": {}
134+
"alpine-3.19": {},
135+
"alpine-3.19-amd64": {}
132136
}
133137
}
134138
]
@@ -140,7 +144,8 @@
140144
"os": "linux",
141145
"osVersion": "alpine3.19",
142146
"tags": {
143-
"alpine-3.19-WithNode": {}
147+
"alpine-3.19-WithNode": {},
148+
"alpine-3.19-WithNode-amd64": {}
144149
}
145150
}
146151
]
@@ -193,7 +198,8 @@
193198
"os": "linux",
194199
"osVersion": "alpine3.20",
195200
"tags": {
196-
"alpine-3.20": {}
201+
"alpine-3.20": {},
202+
"alpine-3.20-amd64": {}
197203
}
198204
}
199205
]
@@ -205,7 +211,8 @@
205211
"os": "linux",
206212
"osVersion": "alpine3.20",
207213
"tags": {
208-
"alpine-3.20-withnode": {}
214+
"alpine-3.20-withnode": {},
215+
"alpine-3.20-withnode-amd64": {}
209216
}
210217
}
211218
]

‎src/azurelinux/3.0/net8.0/cross/amd64-alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
ARG ROOTFS_DIR=/crossrootfs/x64
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder AS builder
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder-amd64 AS builder
44
ARG ROOTFS_DIR
55

66
RUN /scripts/eng/common/cross/build-rootfs.sh x64 alpine3.13 --skipunmount
77

88

9-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-llvm
9+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-llvm-amd64
1010
ARG ROOTFS_DIR
1111

1212
COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR

‎src/azurelinux/3.0/net8.0/cross/amd64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG ROOTFS_DIR=/crossrootfs/x64
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder AS builder
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder-amd64 AS builder
44
ARG ROOTFS_DIR
55

66
RUN /scripts/eng/common/cross/build-rootfs.sh x64 xenial --skipunmount
@@ -43,7 +43,7 @@ RUN LLVM_VERSION=16.0.0 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" SANITIZER_RUNTI
4343
cp compiler-rt_build/lib/linux/libclang_rt.*-x86_64.a $SANITIZER_RUNTIMES_DIR
4444

4545

46-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-llvm
46+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-llvm-amd64
4747
ARG ROOTFS_DIR
4848
ARG LLVM_VERSION_MAJOR=16
4949

‎src/azurelinux/3.0/net8.0/cross/arm-alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
ARG ROOTFS_DIR=/crossrootfs/arm
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder AS builder
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder-amd64 AS builder
44
ARG ROOTFS_DIR
55

66
RUN /scripts/eng/common/cross/build-rootfs.sh arm alpine3.13 --skipunmount
77

88

9-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-llvm
9+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-llvm-amd64
1010
ARG ROOTFS_DIR
1111

1212
COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR

‎src/azurelinux/3.0/net8.0/cross/arm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG ROOTFS_DIR=/crossrootfs/arm
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder AS builder
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder-amd64 AS builder
44
ARG ROOTFS_DIR
55

66
RUN /scripts/eng/common/cross/build-rootfs.sh arm xenial --skipunmount
@@ -43,7 +43,7 @@ RUN LLVM_VERSION=16.0.0 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" SANITIZER_RUNTI
4343
cp compiler-rt_build/lib/linux/libclang_rt.*-armhf.a $SANITIZER_RUNTIMES_DIR
4444

4545

46-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-llvm
46+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-llvm-amd64
4747
ARG ROOTFS_DIR
4848
ARG LLVM_VERSION_MAJOR=16
4949

‎src/azurelinux/3.0/net8.0/cross/arm64-alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
ARG ROOTFS_DIR=/crossrootfs/arm64
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder AS builder
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder-amd64 AS builder
44
ARG ROOTFS_DIR
55

66
RUN /scripts/eng/common/cross/build-rootfs.sh arm64 alpine3.13 --skipunmount
77

88

9-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-llvm
9+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-llvm-amd64
1010
ARG ROOTFS_DIR
1111

1212
COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR

‎src/azurelinux/3.0/net8.0/cross/arm64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG ROOTFS_DIR=/crossrootfs/arm64
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder AS builder
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder-amd64 AS builder
44
ARG ROOTFS_DIR
55

66
RUN /scripts/eng/common/cross/build-rootfs.sh arm64 xenial --skipunmount
@@ -43,7 +43,7 @@ RUN LLVM_VERSION=16.0.0 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" SANITIZER_RUNTI
4343
cp compiler-rt_build/lib/linux/libclang_rt.*-aarch64.a $SANITIZER_RUNTIMES_DIR
4444

4545

46-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-llvm
46+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-llvm-amd64
4747
ARG ROOTFS_DIR
4848
ARG LLVM_VERSION_MAJOR=16
4949

‎src/azurelinux/3.0/net8.0/cross/x86/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG ROOTFS_DIR=/crossrootfs/x86
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder AS builder
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder-amd64 AS builder
44
ARG ROOTFS_DIR
55

66
RUN /scripts/eng/common/cross/build-rootfs.sh x86 xenial --skipunmount
@@ -43,7 +43,7 @@ RUN LLVM_VERSION=16.0.0 LLVM_VERSION_MAJOR="${LLVM_VERSION%%.*}" SANITIZER_RUNTI
4343
cp compiler-rt_build/lib/linux/libclang_rt.*-i386.a $SANITIZER_RUNTIMES_DIR
4444

4545

46-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-llvm
46+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-llvm-amd64
4747
ARG ROOTFS_DIR
4848
ARG LLVM_VERSION_MAJOR=16
4949

‎src/azurelinux/3.0/net8.0/crossdeps-llvm/amd64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder AS builder
1+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder-amd64 AS builder
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-amd64
44

55
# Install LLVM that we built from source
66
COPY --from=builder /usr/local /usr/local

‎src/azurelinux/3.0/net9.0/android/Dockerfile renamed to ‎src/azurelinux/3.0/net9.0/android/amd64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN /usr/local/cmdline-tools/cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_
3030
RUN rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/python3/lib/python3.9/site-packages/ \
3131
&& rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang-tidy
3232

33-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm
33+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm-amd64
3434

3535
# Install Microsoft OpenJDK from the Microsoft OpenJDK 17 Mariner image.
3636
ENV LANG=en_US.UTF-8

‎src/azurelinux/3.0/net9.0/android/docker/Dockerfile renamed to ‎src/azurelinux/3.0/net9.0/android/docker/amd64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-android
1+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-android-amd64
22

33
RUN tdnf update -y \
44
&& tdnf install -y \

‎src/azurelinux/3.0/net9.0/cross/amd64-alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG ROOTFS_DIR=/crossrootfs/x64
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder AS builder
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder-amd64 AS builder
44
ARG ROOTFS_DIR
55

66
RUN /scripts/eng/common/cross/build-rootfs.sh x64 alpine3.13 --skipunmount
@@ -30,7 +30,7 @@ RUN TARGET_TRIPLE="x86_64-alpine-linux-musl" && \
3030
cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
3131
cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
3232

33-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm
33+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm-amd64
3434
ARG ROOTFS_DIR
3535

3636
COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR

‎src/azurelinux/3.0/net9.0/cross/amd64-sanitizer/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG ROOTFS_DIR=/crossrootfs/x64
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder AS builder
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder-amd64 AS builder
44
ARG ROOTFS_DIR
55

66
# Use Ubuntu Bionic as the base image for the rootfs
@@ -38,10 +38,10 @@ RUN TARGET_TRIPLE="x86_64-linux-gnu" && \
3838
-DCOMPILER_RT_BUILD_LIBFUZZER=OFF \
3939
-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
4040
-DCOMPILER_RT_INSTALL_PATH="/usr/local/lib/clang/$CLANG_MAJOR_VERSION" && \
41-
cmake --build runtimes -j && \
41+
cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
4242
cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
4343

44-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm
44+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm-amd64
4545
ARG ROOTFS_DIR
4646

4747
COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang

‎src/azurelinux/3.0/net9.0/cross/amd64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG ROOTFS_DIR=/crossrootfs/x64
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder AS builder
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder-amd64 AS builder
44
ARG ROOTFS_DIR
55

66
RUN /scripts/eng/common/cross/build-rootfs.sh x64 xenial --skipunmount
@@ -39,7 +39,7 @@ RUN TARGET_TRIPLE="x86_64-linux-gnu" && \
3939
cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
4040
cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
4141

42-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm
42+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm-amd64
4343
ARG ROOTFS_DIR
4444

4545
COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang/

‎src/azurelinux/3.0/net9.0/cross/android/amd64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-amd64 AS crossrootx64
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-android
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-android-amd64
44

55
# Copy crossrootfs from AMD64 build image, so we can build Android-targeting code for that arch
66
COPY --from=crossrootx64 /crossrootfs/x64 /crossrootfs/x64

‎src/azurelinux/3.0/net9.0/cross/arm-alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG ROOTFS_DIR=/crossrootfs/arm
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder AS builder
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder-amd64 AS builder
44
ARG ROOTFS_DIR
55

66
RUN /scripts/eng/common/cross/build-rootfs.sh arm alpine3.13 --skipunmount
@@ -30,7 +30,7 @@ RUN TARGET_TRIPLE="armv7-alpine-linux-musleabihf" && \
3030
cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
3131
cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
3232

33-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm
33+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm-amd64
3434
ARG ROOTFS_DIR
3535

3636
COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR

‎src/azurelinux/3.0/net9.0/cross/arm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG ROOTFS_DIR=/crossrootfs/arm
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder AS builder
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder-amd64 AS builder
44
ARG ROOTFS_DIR
55

66
# The arm rootfs targets Ubuntu 22.04, which is the first version with a
@@ -41,7 +41,7 @@ RUN TARGET_TRIPLE="arm-linux-gnueabihf" && \
4141
cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
4242
cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
4343

44-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm
44+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm-amd64
4545
ARG ROOTFS_DIR
4646

4747
COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang/

‎src/azurelinux/3.0/net9.0/cross/arm64-alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG ROOTFS_DIR=/crossrootfs/arm64
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder AS builder
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder-amd64 AS builder
44
ARG ROOTFS_DIR
55

66
RUN /scripts/eng/common/cross/build-rootfs.sh arm64 alpine3.13 --skipunmount
@@ -30,7 +30,7 @@ RUN TARGET_TRIPLE="aarch64-alpine-linux-musl" && \
3030
cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
3131
cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
3232

33-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm
33+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm-amd64
3434
ARG ROOTFS_DIR
3535

3636
COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR

‎src/azurelinux/3.0/net9.0/cross/arm64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG ROOTFS_DIR=/crossrootfs/arm64
22

3-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder AS builder
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder-amd64 AS builder
44
ARG ROOTFS_DIR
55

66
RUN /scripts/eng/common/cross/build-rootfs.sh arm64 xenial --skipunmount
@@ -41,7 +41,7 @@ RUN TARGET_TRIPLE="aarch64-linux-gnu" && \
4141
cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
4242
cmake --install runtimes --prefix "$ROOTFS_DIR/usr"
4343

44-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm
44+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-llvm-amd64
4545
ARG ROOTFS_DIR
4646

4747
COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang/

0 commit comments

Comments
 (0)