Skip to content

Remove debootstrap dependency from riscv64 images #1361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 17, 2025
Merged

Remove debootstrap dependency from riscv64 images #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions src/azurelinux/3.0/net10.0/cross/riscv64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,10 @@ ARG ROOTFS_DIR=/crossrootfs/riscv64
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

# Install the latest debootstrap
RUN tdnf remove -y debootstrap && \
curl -fsL -o debootstrap.tar.gz https://deb.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.140.tar.gz && \
echo "c95eb2aeb952b3fd09f4a07859115d40c4d04a8d551b3071b0a10fcd0db7ebc4 debootstrap.tar.gz" | sha256sum -c - && \
tar xzf debootstrap.tar.gz -C / && \
ln -s /debootstrap/debootstrap -t /usr/local/bin && \
rm -f debootstrap.tar.gz

RUN /scripts/eng/common/cross/build-rootfs.sh riscv64 noble --skipunmount
RUN rootfsEnv="/usr/local/share/rootfs" && \
python3 -m venv "$rootfsEnv" && \
"$rootfsEnv/bin/python" -m pip install aiohttp zstandard && \
PYTHON_EXECUTABLE="$rootfsEnv/bin/python" /scripts/eng/common/cross/build-rootfs.sh riscv64 noble --skipunmount --skipemulation

RUN TARGET_TRIPLE="riscv64-linux-gnu" && \
CLANG_MAJOR_VERSION=$(clang --version | grep -oP "(?<=version )\d+") && \
Expand Down
13 changes: 4 additions & 9 deletions src/azurelinux/3.0/net8.0/cross/riscv64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,10 @@ ARG ROOTFS_DIR=/crossrootfs/riscv64
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

# Install the latest debootstrap
RUN tdnf remove -y debootstrap && \
curl -fsL -o debootstrap.tar.gz https://deb.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.140.tar.gz && \
echo "c95eb2aeb952b3fd09f4a07859115d40c4d04a8d551b3071b0a10fcd0db7ebc4 debootstrap.tar.gz" | sha256sum -c - && \
tar xzf debootstrap.tar.gz -C / && \
ln -s /debootstrap/debootstrap -t /usr/local/bin && \
rm -f debootstrap.tar.gz

RUN /scripts/eng/common/cross/build-rootfs.sh riscv64 noble --skipunmount
RUN rootfsEnv="/usr/local/share/rootfs" && \
python3 -m venv "$rootfsEnv" && \
"$rootfsEnv/bin/python" -m pip install aiohttp zstandard && \
PYTHON_EXECUTABLE="$rootfsEnv/bin/python" /scripts/eng/common/cross/build-rootfs.sh riscv64 noble --skipunmount --skipemulation

RUN TARGET_TRIPLE="riscv64-linux-gnu" && \
CLANG_MAJOR_VERSION=$(clang --version | grep -oP "(?<=version )\d+") && \
Expand Down
13 changes: 4 additions & 9 deletions src/azurelinux/3.0/net9.0/cross/riscv64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,10 @@ ARG ROOTFS_DIR=/crossrootfs/riscv64
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-crossdeps-builder-amd64 AS builder
ARG ROOTFS_DIR

# Install the latest debootstrap
RUN tdnf remove -y debootstrap && \
curl -fsL -o debootstrap.tar.gz https://deb.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.140.tar.gz && \
echo "c95eb2aeb952b3fd09f4a07859115d40c4d04a8d551b3071b0a10fcd0db7ebc4 debootstrap.tar.gz" | sha256sum -c - && \
tar xzf debootstrap.tar.gz -C / && \
ln -s /debootstrap/debootstrap -t /usr/local/bin && \
rm -f debootstrap.tar.gz

RUN /scripts/eng/common/cross/build-rootfs.sh riscv64 noble --skipunmount
RUN rootfsEnv="/usr/local/share/rootfs" && \
python3 -m venv "$rootfsEnv" && \
"$rootfsEnv/bin/python" -m pip install aiohttp zstandard && \
PYTHON_EXECUTABLE="$rootfsEnv/bin/python" /scripts/eng/common/cross/build-rootfs.sh riscv64 noble --skipunmount --skipemulation

RUN TARGET_TRIPLE="riscv64-linux-gnu" && \
CLANG_MAJOR_VERSION=$(clang --version | grep -oP "(?<=version )\d+") && \
Expand Down