Skip to content

Commit

Permalink
ci: Update docker images for arm
Browse files Browse the repository at this point in the history
See https://github.com/cross-rs/cross/wiki/Configuration#builddockerfile
for context regarding the $CROSS_BASE_IMAGE environment variable. Here, it
resolves to
ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:{{cross_version}}

Relies on docker caching instead of pre-building the image.

Cross made the change to the GHCR on cross-rs/cross#609

Add newline at EOF for some files.
  • Loading branch information
LucasFA committed Mar 12, 2024
1 parent ac6cbb2 commit e031882
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/cpal.yml
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
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
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 \

0 comments on commit e031882

Please sign in to comment.