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

ci: Update docker images for arm #865

Merged
merged 1 commit into from
Mar 14, 2024
Merged

ci: Update docker images for arm #865

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
3 changes: 0 additions & 3 deletions .github/workflows/cpal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ jobs:
with:
target: armv7-unknown-linux-gnueabihf

- name: Build image
run: docker build -t cross/cpal_armv7:v1 ./

- name: Install cross
run: cargo install cross

Expand Down
4 changes: 2 additions & 2 deletions Cross.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[target.armv7-unknown-linux-gnueabihf]
image = "cross/cpal_armv7:v1"
dockerfile = "Dockerfile"

[target.armv7-unknown-linux-gnueabihf.env]
passthrough = [
"RUSTFLAGS",
]
]
5 changes: 3 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
FROM rustembedded/cross:armv7-unknown-linux-gnueabihf
ARG CROSS_BASE_IMAGE
FROM $CROSS_BASE_IMAGE

ENV PKG_CONFIG_ALLOW_CROSS 1
ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabihf/pkgconfig/

RUN dpkg --add-architecture armhf && \
apt-get update && \
apt-get install libasound2-dev:armhf -y && \
apt-get install libjack-jackd2-dev:armhf libjack-jackd2-0:armhf -y \
apt-get install libjack-jackd2-dev:armhf libjack-jackd2-0:armhf -y \
Loading