From ccb668a1b61bf3d9dc17658ff24274125cd05256 Mon Sep 17 00:00:00 2001
From: Blake Blackshear <blakeb@blakeshome.com>
Date: Sun, 17 Jan 2021 08:18:54 -0600
Subject: [PATCH] no longer need special aarch64 wheels build

---
 Makefile                         |  2 +-
 docker/Dockerfile.wheels         |  2 +-
 docker/Dockerfile.wheels.aarch64 | 51 --------------------------------
 3 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 docker/Dockerfile.wheels.aarch64

diff --git a/Makefile b/Makefile
index 9dc362170..70293631c 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ amd64nvidia_frigate: version web
 amd64nvidia_all: amd64nvidia_wheels amd64nvidia_ffmpeg amd64nvidia_frigate
 
 aarch64_wheels:
-	docker build --tag blakeblackshear/frigate-wheels:1.0.0-aarch64 --file docker/Dockerfile.wheels.aarch64 .
+	docker build --tag blakeblackshear/frigate-wheels:1.0.0-aarch64 --file docker/Dockerfile.wheels .
 
 aarch64_ffmpeg:
 	docker build --tag blakeblackshear/frigate-ffmpeg:1.0.0-aarch64 --file docker/Dockerfile.ffmpeg.aarch64 .
diff --git a/docker/Dockerfile.wheels b/docker/Dockerfile.wheels
index bc7b6a594..a6fa222ec 100644
--- a/docker/Dockerfile.wheels
+++ b/docker/Dockerfile.wheels
@@ -18,7 +18,7 @@ RUN apt-get -qq update \
     gcc gfortran libopenblas-dev liblapack-dev cython
 
 RUN wget -q https://bootstrap.pypa.io/get-pip.py -O get-pip.py \
-    && python3 get-pip.py
+    && python3 get-pip.py "pip==20.2.4"
 
 RUN pip3 install scikit-build
 
diff --git a/docker/Dockerfile.wheels.aarch64 b/docker/Dockerfile.wheels.aarch64
deleted file mode 100644
index b264c6f84..000000000
--- a/docker/Dockerfile.wheels.aarch64
+++ /dev/null
@@ -1,51 +0,0 @@
-FROM ubuntu:20.04 as build
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get -qq update \
-    && apt-get -qq install -y \
-    python3 \
-    python3-dev \
-    wget \
-    # opencv dependencies
-    build-essential cmake git pkg-config 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 \
-    # scipy dependencies
-    gcc gfortran libopenblas-dev liblapack-dev cython
-
-RUN wget -q https://bootstrap.pypa.io/get-pip.py -O get-pip.py \
-    && python3 get-pip.py
-
-# need to build cmake from source because binary distribution is broken for arm64
-# https://github.com/scikit-build/cmake-python-distributions/issues/115
-# https://github.com/skvark/opencv-python/issues/366
-# https://github.com/scikit-build/cmake-python-distributions/issues/96#issuecomment-663062358
-RUN pip3 install scikit-build
-
-RUN git clone https://github.com/scikit-build/cmake-python-distributions.git \
-    && cd cmake-python-distributions/ \
-    && python3 setup.py bdist_wheel
-
-RUN pip3 install cmake-python-distributions/dist/*.whl
-
-RUN pip3 wheel --wheel-dir=/wheels \
-    opencv-python-headless \
-    numpy \
-    imutils \
-    scipy \
-    psutil \
-    Flask \
-    paho-mqtt \
-    PyYAML \
-    matplotlib \
-    click \
-    setproctitle \
-    peewee
-
-FROM scratch
-
-COPY --from=build /wheels /wheels