-
Notifications
You must be signed in to change notification settings - Fork 105
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.
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
Add helix image for armv6 raspbian #1083
base: main
Are you sure you want to change the base?
Changes from all commits
20ecbbb
7afb569
8667ab0
360f9ce
7d24c9c
232c599
7b1bad6
e59bdc7
95a10f5
832419e
e5366a6
131b3d4
c28e26d
2981dfd
989dbf0
f4ed118
3a2003b
f410e6a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
ARG ROOTFS_DIR=/crossrootfs | ||
|
||
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:raspbian-10-crossdeps as builder | ||
FROM --platform=linux/arm/v7 mcr.microsoft.com/dotnet-buildtools/prereqs:raspbian-12-crossdeps as builder | ||
|
||
ARG ROOTFS_DIR | ||
|
||
|
@@ -9,7 +9,7 @@ RUN git config --global user.email builder@dotnet-buildtools-prereqs-docker && \ | |
git clone --depth 1 --single-branch https://github.com/dotnet/arcade /scripts | ||
|
||
# Build the rootfs | ||
RUN /scripts/eng/common/cross/build-rootfs.sh armv6 raspbian --skipunmount | ||
RUN /scripts/eng/common/cross/build-rootfs.sh armv6 bookworm lldb15 --skipunmount | ||
|
||
FROM scratch | ||
ARG ROOTFS_DIR | ||
|
@@ -45,8 +45,10 @@ RUN apt-get update && \ | |
libunwind8 \ | ||
locales \ | ||
locales-all \ | ||
pkg-config \ | ||
python3-dev \ | ||
python3-pip \ | ||
rustc \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. https://github.com/dotnet/dotnet-buildtools-prereqs-docker/pull/1145/files installs rust from rustup instead because apparently the rustc in bookworm is too old? |
||
sudo \ | ||
tzdata \ | ||
unzip \ | ||
|
@@ -60,7 +62,7 @@ ENV LANG=en_US.utf8 | |
RUN ln -sf /usr/bin/python3 /usr/bin/python && \ | ||
pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ | ||
export CRYPTOGRAPHY_DONT_BUILD_RUST=1 && \ | ||
pip install ./helix_scripts-*-py3-none-any.whl | ||
pip install ./helix_scripts-*-py3-none-any.whl --break-system-packages | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. please add a comment why we need --break-system-packages There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Alternatively, could we use the multistage docker + python venv approach we've done in all the other images and avoid using |
||
|
||
# Create helixbot user and give rights to sudo without password | ||
# (we use two users here to ensure volume mounting works with two possible UIDs of the host UID) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@am11 FYI we can probably remove the code in https://github.com/dotnet/arcade/blob/d1bc0779143e410ec82696f9865c4eb407db8d67/eng/common/cross/build-rootfs.sh#L170-L183 which sets the __UbuntuRepo, __CodeName etc since that is handled by the
bookworm
argument