Skip to content

Commit

Permalink
Fix tag names
Browse files Browse the repository at this point in the history
  • Loading branch information
sbomer committed Nov 21, 2024
1 parent 8b63921 commit 1daba13
Show file tree
Hide file tree
Showing 19 changed files with 43 additions and 44 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN /usr/local/cmdline-tools/cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_
RUN rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/python3/lib/python3.9/site-packages/ \
&& rm -r ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang-tidy

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64

# Install Microsoft OpenJDK from the Microsoft OpenJDK 17 Mariner image.
ENV LANG=en_US.UTF-8
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-android
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-android-amd64

RUN tdnf update -y \
&& tdnf install -y \
Expand Down
4 changes: 2 additions & 2 deletions src/azurelinux/3.0/net10.0/cross/amd64-alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG ROOTFS_DIR=/crossrootfs/x64

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

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

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
ARG ROOTFS_DIR

COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
4 changes: 2 additions & 2 deletions src/azurelinux/3.0/net10.0/cross/amd64-sanitizer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG ROOTFS_DIR=/crossrootfs/x64

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

# Use Ubuntu Bionic as the base image for the rootfs
Expand Down Expand Up @@ -43,7 +43,7 @@ RUN TARGET_TRIPLE="x86_64-linux-gnu" && \
cmake --build runtimes -j && \
cmake --install runtimes --prefix "$ROOTFS_DIR/usr"

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
ARG ROOTFS_DIR

COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang
Expand Down
4 changes: 2 additions & 2 deletions src/azurelinux/3.0/net10.0/cross/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG ROOTFS_DIR=/crossrootfs/x64

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

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

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
ARG ROOTFS_DIR

COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang/
Expand Down
2 changes: 1 addition & 1 deletion src/azurelinux/3.0/net10.0/cross/android/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-amd64 AS crossrootx64

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-android
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-android-amd64

# Copy crossrootfs from AMD64 build image, so we can build Android-targeting code for that arch
COPY --from=crossrootx64 /crossrootfs/x64 /crossrootfs/x64
4 changes: 2 additions & 2 deletions src/azurelinux/3.0/net10.0/cross/arm-alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG ROOTFS_DIR=/crossrootfs/arm

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

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

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
ARG ROOTFS_DIR

COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
4 changes: 2 additions & 2 deletions src/azurelinux/3.0/net10.0/cross/arm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG ROOTFS_DIR=/crossrootfs/arm

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

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

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
ARG ROOTFS_DIR

COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang/
Expand Down
4 changes: 2 additions & 2 deletions src/azurelinux/3.0/net10.0/cross/arm64-alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG ROOTFS_DIR=/crossrootfs/arm64

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

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

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
ARG ROOTFS_DIR

COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
4 changes: 2 additions & 2 deletions src/azurelinux/3.0/net10.0/cross/arm64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG ROOTFS_DIR=/crossrootfs/arm64

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

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

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
ARG ROOTFS_DIR

COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang/
Expand Down
4 changes: 2 additions & 2 deletions src/azurelinux/3.0/net10.0/cross/armv6/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG ROOTFS_DIR=/crossrootfs/armv6

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

# Install raspbian package signing keys
Expand All @@ -12,7 +12,7 @@ RUN wget http://raspbian.raspberrypi.org/raspbian/pool/main/r/raspbian-archive-k

RUN /scripts/eng/common/cross/build-rootfs.sh armv6 bookworm lldb13

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
ARG ROOTFS_DIR

COPY --from=builder "$ROOTFS_DIR" "$ROOTFS_DIR"
4 changes: 2 additions & 2 deletions src/azurelinux/3.0/net10.0/cross/freebsd/13/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG ROOTFS_DIR=/crossrootfs/x64

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

# Install packages needed by the FreeBSD bootstrap scripts
Expand All @@ -13,7 +13,7 @@ RUN tdnf install -y \

RUN /scripts/eng/common/cross/build-rootfs.sh freebsd13 x64

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
ARG ROOTFS_DIR

COPY --from=builder "$ROOTFS_DIR" "$ROOTFS_DIR"
4 changes: 2 additions & 2 deletions src/azurelinux/3.0/net10.0/cross/ppc64le/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
ARG ROOTFS_DIR=/crossrootfs/ppc64le

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

RUN /scripts/eng/common/cross/build-rootfs.sh bionic ppc64le

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
ARG ROOTFS_DIR

COPY --from=builder "$ROOTFS_DIR" "$ROOTFS_DIR"
4 changes: 2 additions & 2 deletions src/azurelinux/3.0/net10.0/cross/riscv64-alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG ROOTFS_DIR=/crossrootfs/riscv64

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

RUN /scripts/eng/common/cross/build-rootfs.sh riscv64 alpine3.20 --skipunmount
Expand Down Expand Up @@ -30,7 +30,7 @@ RUN TARGET_TRIPLE="riscv64-alpine-linux-musl" && \
cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
cmake --install runtimes --prefix "$ROOTFS_DIR/usr"

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
ARG ROOTFS_DIR

COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
4 changes: 2 additions & 2 deletions src/azurelinux/3.0/net10.0/cross/riscv64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG ROOTFS_DIR=/crossrootfs/riscv64

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

# Install the latest debootstrap
Expand Down Expand Up @@ -47,7 +47,7 @@ RUN TARGET_TRIPLE="riscv64-linux-gnu" && \
cmake --build runtimes -j $(getconf _NPROCESSORS_ONLN) && \
cmake --install runtimes --prefix "$ROOTFS_DIR/usr"

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
ARG ROOTFS_DIR

COPY --from=builder /usr/local/lib/clang /usr/local/lib/clang/
Expand Down
4 changes: 2 additions & 2 deletions src/azurelinux/3.0/net10.0/cross/s390x/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
ARG ROOTFS_DIR=/crossrootfs/s390x

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

RUN /scripts/eng/common/cross/build-rootfs.sh bionic s390x

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
ARG ROOTFS_DIR

COPY --from=builder "$ROOTFS_DIR" "$ROOTFS_DIR"
4 changes: 2 additions & 2 deletions src/azurelinux/3.0/net10.0/cross/x86/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ARG ROOTFS_DIR=/crossrootfs/x86

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

# We don't ship linux-x86 binaries, so we don't need to make a custom libc++ build for servicing concerns.
# We don't sanitize or instrument the linux-x64 build (as we don't ship it), so we don't need to build those runtime support libraries either.
RUN /scripts/eng/common/cross/build-rootfs.sh x86 bionic --skipunmount

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-llvm-amd64
ARG ROOTFS_DIR

COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR
4 changes: 2 additions & 2 deletions src/azurelinux/3.0/net10.0/crossdeps-llvm/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder AS builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-amd64

# Install LLVM that we built from source
COPY --from=builder /usr/local /usr/local
21 changes: 10 additions & 11 deletions src/azurelinux/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"os": "linux",
"osVersion": "azurelinux3.0",
"tags": {
"azurelinux-3.0-net10.0-crossdeps": {}
"azurelinux-3.0-net10.0-crossdeps-amd64": {}
}
}
]
Expand Down Expand Up @@ -444,7 +444,7 @@
"os": "linux",
"osVersion": "azurelinux3.0",
"tags": {
"azurelinux-3.0-net10.0-fpm": {}
"azurelinux-3.0-net10.0-fpm-amd64": {}
}
}
]
Expand All @@ -456,7 +456,7 @@
"os": "linux",
"osVersion": "azurelinux3.0",
"tags": {
"azurelinux-3.0-net10.0-crossdeps-builder": {}
"azurelinux-3.0-net10.0-crossdeps-builder-amd64": {}
}
}
]
Expand All @@ -468,7 +468,7 @@
"os": "linux",
"osVersion": "azurelinux3.0",
"tags": {
"azurelinux-3.0-net10.0-crossdeps-llvm": {}
"azurelinux-3.0-net10.0-crossdeps-llvm-amd64": {}
}
}
]
Expand Down Expand Up @@ -607,11 +607,11 @@
{
"platforms": [
{
"dockerfile": "src/azurelinux/3.0/net10.0/android",
"dockerfile": "src/azurelinux/3.0/net10.0/android/amd64",
"os": "linux",
"osVersion": "azurelinux3.0",
"tags": {
"azurelinux-3.0-net10.0-android": {}
"azurelinux-3.0-net10.0-android-amd64": {}
}
}
]
Expand All @@ -631,11 +631,11 @@
{
"platforms": [
{
"dockerfile": "src/azurelinux/3.0/net10.0/android/docker",
"dockerfile": "src/azurelinux/3.0/net10.0/android/docker/amd64",
"os": "linux",
"osVersion": "azurelinux3.0",
"tags": {
"azurelinux-3.0-net10.0-android-docker": {}
"azurelinux-3.0-net10.0-android-docker-amd64": {}
}
}
]
Expand All @@ -647,8 +647,7 @@
"os": "linux",
"osVersion": "azurelinux3.0",
"tags": {
"azurelinux-3.0-net10.0-android-openssl": {},
"azurelinux-3.0-net10.0-cross-android-openssl": {}
"azurelinux-3.0-net10.0-cross-android-openssl-amd64": {}
}
}
]
Expand All @@ -660,7 +659,7 @@
"os": "linux",
"osVersion": "azurelinux3.0",
"tags": {
"azurelinux-3.0-net10.0-cross-freebsd-13": {}
"azurelinux-3.0-net10.0-cross-freebsd-13-amd64": {}
}
}
]
Expand Down

0 comments on commit 1daba13

Please sign in to comment.