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.

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

Use Mariner not Ubuntu as armv6 host image #1014

Merged
merged 2 commits into from
Apr 24, 2024
Merged

Use Mariner not Ubuntu as armv6 host image #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b8d77e
Use Mariner not Ubuntu as armv6 host image
directhex Apr 22, 2024
c598db5
Don't bump chroot distro
directhex Apr 24, 2024
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
16 changes: 16 additions & 0 deletions src/cbl-mariner/2.0/cross/armv6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-builder-local AS builder
ARG ROOTFS_DIR=/crossrootfs/armv6

# Install raspbian package signing keys
RUN wget http://raspbian.raspberrypi.org/raspbian/pool/main/r/raspbian-archive-keyring/raspbian-archive-keyring_20120528.2.tar.gz && \
echo "b3f22fa8d63d8d2f8b81f77784c3dc8f65fd6a10eadda63ac30a2da483ffc9d6ac72d0b5d3d0d5bdf2a61ca264a26fa071aed3acc780f062c8ab27a2e5ac6d49 raspbian-archive-keyring_20120528.2.tar.gz" | sha512sum -c && \
tar xf raspbian-archive-keyring_20120528.2.tar.gz && \
mv raspbian-archive-keyring-20120528.2/keyrings/raspbian-archive-keyring.gpg /usr/share/keyrings/ && \
rm -r raspbian-archive-keyring_20120528.2.tar.gz raspbian-archive-keyring-20120528.2

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

FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-crossdeps-llvm-local
ARG ROOTFS_DIR=/crossrootfs/armv6

COPY --from=builder "$ROOTFS_DIR" "$ROOTFS_DIR"
16 changes: 16 additions & 0 deletions src/cbl-mariner/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,22 @@
}
]
},
{
"platforms": [
{
"dockerfile": "src/cbl-mariner/2.0/cross/armv6",
"os": "linux",
"osVersion": "cbl-mariner2.0",
"tags": {
"cbl-mariner-2.0-cross-armv6-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
"cbl-mariner-2.0-cross-armv6$(FloatingTagSuffix)": {},
"cbl-mariner-2.0-cross-armv6-local": {
"isLocal": true
}
}
}
]
},
{
"platforms": [
{
Expand Down
3 changes: 0 additions & 3 deletions src/ubuntu/20.04/cross/armv6/10/Dockerfile
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/ubuntu/20.04/cross/armv6/10/hooks/post-build
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/ubuntu/20.04/cross/armv6/10/hooks/pre-build
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/ubuntu/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,19 +482,6 @@
}
]
},
{
"platforms": [
{
"dockerfile": "src/ubuntu/20.04/cross/armv6/10",
"os": "linux",
"osVersion": "focal",
"tags": {
"ubuntu-20.04-cross-armv6-raspbian-10-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
"ubuntu-20.04-cross-armv6-raspbian-10$(FloatingTagSuffix)": {}
}
}
]
},
{
"platforms": [
{
Expand Down