Skip to content
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

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu.azurecr.io/ubuntu:18.04
FROM ubuntu.azurecr.io/ubuntu:22.04

# Install the base toolchain we need to build anything (clang, cmake, make and the like).
RUN apt-get update \
Expand Down
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

Expand All @@ -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
Copy link
Member

@akoeplinger akoeplinger Oct 31, 2024

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


FROM scratch
ARG ROOTFS_DIR
Expand Down Expand Up @@ -45,8 +45,10 @@ RUN apt-get update && \
libunwind8 \
locales \
locales-all \
pkg-config \
python3-dev \
python3-pip \
rustc \
Copy link
Member

Choose a reason for hiding this comment

The 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 \
Expand All @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add a comment why we need --break-system-packages

Copy link
Member

Choose a reason for hiding this comment

The 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 --break-system-packages (#1142)?


# 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)
Expand Down
20 changes: 17 additions & 3 deletions src/raspbian/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,29 @@
"platforms": [
{
"architecture": "arm",
"dockerfile": "src/raspbian/10/crossdeps/arm32v7",
"dockerfile": "src/raspbian/12/crossdeps/arm32v7",
"os": "linux",
"osVersion": "buster",
"osVersion": "jammy",
akoeplinger marked this conversation as resolved.
Show resolved Hide resolved
"tags": {
"raspbian-10-crossdeps": {}
"raspbian-12-crossdeps": {}
},
"variant": "v7"
}
]
},
{
"platforms": [
{
"architecture": "arm",
"dockerfile": "src/raspbian/12/helix/arm32v6",
"os": "linux",
"osVersion": "bookworm",
"tags": {
"raspbian-12-helix-arm32v6": {}
},
"variant": "v6"
}
]
}
]
}
Expand Down
Loading