Skip to content

Commit 640554f

Browse files
authored
Use shared Arcade scripts in Azure Linux 4.0
1 parent 016fb3a commit 640554f

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

  • src/azurelinux/4.0/net11.0/crossdeps-builder/amd64

src/azurelinux/4.0/net11.0/crossdeps-builder/amd64/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Arcade rootfs cross-build scripts, provided as a separate image so they can be copied
2+
# in without requiring the repo root as the Docker build context. See eng/cross-scripts.Dockerfile.
3+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cross-scripts-amd64 AS cross-scripts
4+
15
FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0
26

37
ARG PIP_INDEX_URL
@@ -131,12 +135,8 @@ RUN \
131135

132136
ENV PATH="/opt/llvm/bin:$PATH"
133137

134-
# Obtain arcade scripts used to build rootfs
135-
ARG ARCADE_COMMIT=e5f974ba880c3da69932191c665e90ee64e8da26
136-
RUN git config --global user.email builder@dotnet-buildtools-prereqs-docker && \
137-
git init /scripts && \
138-
git -C /scripts fetch --depth 1 https://github.com/dotnet/arcade ${ARCADE_COMMIT} && \
139-
git -C /scripts checkout --detach FETCH_HEAD
138+
# Copy arcade scripts used to build rootfs
139+
COPY --from=cross-scripts /eng/common/cross/ /scripts/eng/common/cross/
140140

141141
# Clear PIP_INDEX_URL since it contains a short-lived token that should not persist in the final image
142142
ENV PIP_INDEX_URL=

0 commit comments

Comments
 (0)