diff --git a/.github/workflows/cpal.yml b/.github/workflows/cpal.yml index c2061eb..4c475fa 100644 --- a/.github/workflows/cpal.yml +++ b/.github/workflows/cpal.yml @@ -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 diff --git a/Cross.toml b/Cross.toml index 39abb81..6d0ad81 100644 --- a/Cross.toml +++ b/Cross.toml @@ -1,7 +1,7 @@ [target.armv7-unknown-linux-gnueabihf] -image = "cross/cpal_armv7:v1" +dockerfile = "Dockerfile" [target.armv7-unknown-linux-gnueabihf.env] passthrough = [ "RUSTFLAGS", -] \ No newline at end of file +] diff --git a/Dockerfile b/Dockerfile index 05045c3..3fa3b24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -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/ @@ -6,4 +7,4 @@ 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 \ \ No newline at end of file + apt-get install libjack-jackd2-dev:armhf libjack-jackd2-0:armhf -y \