Skip to content

Commit 437d47f

Browse files
authored
ci: Update docker images for arm (#865)
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.
1 parent ac6cbb2 commit 437d47f

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

.github/workflows/cpal.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ jobs:
8585
with:
8686
target: armv7-unknown-linux-gnueabihf
8787

88-
- name: Build image
89-
run: docker build -t cross/cpal_armv7:v1 ./
90-
9188
- name: Install cross
9289
run: cargo install cross
9390

Cross.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[target.armv7-unknown-linux-gnueabihf]
2-
image = "cross/cpal_armv7:v1"
2+
dockerfile = "Dockerfile"
33

44
[target.armv7-unknown-linux-gnueabihf.env]
55
passthrough = [
66
"RUSTFLAGS",
7-
]
7+
]

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
FROM rustembedded/cross:armv7-unknown-linux-gnueabihf
1+
ARG CROSS_BASE_IMAGE
2+
FROM $CROSS_BASE_IMAGE
23

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

67
RUN dpkg --add-architecture armhf && \
78
apt-get update && \
89
apt-get install libasound2-dev:armhf -y && \
9-
apt-get install libjack-jackd2-dev:armhf libjack-jackd2-0:armhf -y \
10+
apt-get install libjack-jackd2-dev:armhf libjack-jackd2-0:armhf -y \

0 commit comments

Comments
 (0)