From 1ac238eae91f257c49aa50463a74584ac15cae7e Mon Sep 17 00:00:00 2001 From: Aleksandar Date: Wed, 9 Oct 2024 12:21:53 +0100 Subject: [PATCH] Update contrib/Dockerfile image (#1367) --- contrib/Dockerfile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/contrib/Dockerfile b/contrib/Dockerfile index 377ece7a..cf972582 100644 --- a/contrib/Dockerfile +++ b/contrib/Dockerfile @@ -13,17 +13,18 @@ # $ docker run -v /tmp/librespot-build:/build librespot-cross cargo build --release --target arm-unknown-linux-gnueabi --no-default-features --features alsa-backend # $ docker run -v /tmp/librespot-build:/build librespot-cross cargo build --release --target aarch64-unknown-linux-gnu --no-default-features --features alsa-backend -FROM debian:stretch +FROM debian:bookworm -RUN echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list -RUN echo "deb http://archive.debian.org/debian stretch-proposed-updates main" >> /etc/apt/sources.list -RUN echo "deb http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list +RUN echo "deb http://deb.debian.org/debian bookworm main" > /etc/apt/sources.list +RUN echo "deb http://deb.debian.org/debian bookworm-updates main" >> /etc/apt/sources.list +RUN echo "deb http://deb.debian.org/debian-security bookworm-security main" >> /etc/apt/sources.list RUN dpkg --add-architecture arm64 RUN dpkg --add-architecture armhf RUN dpkg --add-architecture armel RUN apt-get update +RUN apt-get install -y cmake libclang-dev RUN apt-get install -y curl git build-essential crossbuild-essential-arm64 crossbuild-essential-armel crossbuild-essential-armhf pkg-config RUN apt-get install -y libasound2-dev libasound2-dev:arm64 libasound2-dev:armel libasound2-dev:armhf RUN apt-get install -y libpulse0 libpulse0:arm64 libpulse0:armel libpulse0:armhf @@ -33,14 +34,15 @@ ENV PATH="/root/.cargo/bin/:${PATH}" RUN rustup target add aarch64-unknown-linux-gnu RUN rustup target add arm-unknown-linux-gnueabi RUN rustup target add arm-unknown-linux-gnueabihf +RUN cargo install bindgen-cli RUN mkdir /.cargo && \ echo '[target.aarch64-unknown-linux-gnu]\nlinker = "aarch64-linux-gnu-gcc"' > /.cargo/config && \ echo '[target.arm-unknown-linux-gnueabihf]\nlinker = "arm-linux-gnueabihf-gcc"' >> /.cargo/config && \ echo '[target.arm-unknown-linux-gnueabi]\nlinker = "arm-linux-gnueabi-gcc"' >> /.cargo/config -ENV CARGO_TARGET_DIR /build -ENV CARGO_HOME /build/cache +ENV CARGO_TARGET_DIR=/build +ENV CARGO_HOME=/build/cache ENV PKG_CONFIG_ALLOW_CROSS=1 ENV PKG_CONFIG_PATH_aarch64-unknown-linux-gnu=/usr/lib/aarch64-linux-gnu/pkgconfig/ ENV PKG_CONFIG_PATH_arm-unknown-linux-gnueabihf=/usr/lib/arm-linux-gnueabihf/pkgconfig/