From 560ee0104d30d997c728b686733a3c2fa9968b76 Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Mon, 4 Jul 2022 09:06:26 -0500 Subject: [PATCH] arm32 compat --- docker/Dockerfile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 56579c7ff..9b93c1a38 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,8 +11,8 @@ RUN apt-get -qq update \ apt-transport-https \ gnupg \ wget \ - && wget -O - http://archive.raspberrypi.org/debian/raspberrypi.gpg.key | apt-key add - \ - && echo "deb http://archive.raspberrypi.org/debian/ bullseye main" | tee /etc/apt/sources.list.d/raspi.list \ + && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9165938D90FDDD2E \ + && echo "deb http://raspbian.raspberrypi.org/raspbian/ bullseye main contrib non-free rpi" | tee /etc/apt/sources.list.d/raspi.list \ && apt-get -qq update \ && apt-get -qq install -y \ python3 \ @@ -67,8 +67,8 @@ RUN apt-get -qq update \ unzip tzdata libxml2 xz-utils \ python3-pip \ # add raspberry pi repo - && wget -O - http://archive.raspberrypi.org/debian/raspberrypi.gpg.key | apt-key add - \ - && echo "deb http://archive.raspberrypi.org/debian/ bullseye main" | tee /etc/apt/sources.list.d/raspi.list \ + && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9165938D90FDDD2E \ + && echo "deb http://raspbian.raspberrypi.org/raspbian/ bullseye main contrib non-free rpi" | tee /etc/apt/sources.list.d/raspi.list \ # add coral repo && apt-key adv --fetch-keys https://packages.cloud.google.com/apt/doc/apt-key.gpg \ && echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" > /etc/apt/sources.list.d/coral-edgetpu.list \ @@ -89,6 +89,16 @@ RUN apt-get -qq update \ apt-get -qq install --no-install-recommends --no-install-suggests -y \ mesa-va-drivers intel-media-va-driver-non-free; \ fi \ + # not sure why 32bit arm requires all these + && if [ "${TARGETARCH}" = "arm" ]; then \ + apt-get -qq install --no-install-recommends --no-install-suggests -y \ + libgtk-3-dev \ + libavcodec-dev libavformat-dev libswscale-dev libv4l-dev \ + libxvidcore-dev libx264-dev libjpeg-dev libpng-dev libtiff-dev \ + gfortran openexr libatlas-base-dev libssl-dev\ + libtbb2 libtbb-dev libdc1394-22-dev libopenexr-dev \ + libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev; \ + fi \ && rm -rf /wheels \ && apt-get remove gnupg apt-transport-https -y \ && apt-get clean autoclean -y \