From d5fb20c524810caab2b268cc64f2b43940c24e77 Mon Sep 17 00:00:00 2001
From: Blake Blackshear <blakeb@blakeshome.com>
Date: Fri, 25 Sep 2020 19:36:22 -0500
Subject: [PATCH] refactor dockerfile

---
 docker/Dockerfile                    | 16 ++++++++++++++++
 Dockerfile => docker/Dockerfile.base |  7 -------
 2 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 docker/Dockerfile
 rename Dockerfile => docker/Dockerfile.base (83%)
 mode change 100755 => 100644

diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 000000000..334da8fa1
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,16 @@
+FROM frigate.base
+LABEL maintainer "blakeb@blakeshome.com"
+
+ENV DEBIAN_FRONTEND=noninteractive
+# Install packages for apt repo
+RUN apt -qq update \
+    && apt -qq install --no-install-recommends -y \
+        ffmpeg \
+        # VAAPI drivers for Intel hardware accel
+        libva-drm2 libva2 i965-va-driver vainfo \
+        ## Tensorflow lite
+    && wget -q https://dl.google.com/coral/python/tflite_runtime-2.1.0.post1-cp38-cp38-linux_x86_64.whl \
+    && python3.8 -m pip install tflite_runtime-2.1.0.post1-cp38-cp38-linux_x86_64.whl \
+    && rm tflite_runtime-2.1.0.post1-cp38-cp38-linux_x86_64.whl \
+    && rm -rf /var/lib/apt/lists/* \
+    && (apt-get autoremove -y; apt-get autoclean -y)
\ No newline at end of file
diff --git a/Dockerfile b/docker/Dockerfile.base
old mode 100755
new mode 100644
similarity index 83%
rename from Dockerfile
rename to docker/Dockerfile.base
index 5fd62ec48..75ba29da3
--- a/Dockerfile
+++ b/docker/Dockerfile.base
@@ -14,9 +14,6 @@ RUN apt -qq update && apt -qq install --no-install-recommends -y \
         python3.8 \
         python3.8-dev \
         python3-pip \
-        ffmpeg \
-        # VAAPI drivers for Intel hardware accel
-        libva-drm2 libva2 i965-va-driver vainfo \
     && python3.8 -m pip install -U pip \
     && python3.8 -m pip install -U wheel setuptools \
     && python3.8 -m pip install -U \
@@ -38,10 +35,6 @@ RUN apt -qq update && apt -qq install --no-install-recommends -y \
     && echo "libedgetpu1-max libedgetpu/accepted-eula boolean true" | debconf-set-selections \
     && apt -qq install --no-install-recommends -y \
         libedgetpu1-max \
-    ## Tensorflow lite
-    && wget -q https://dl.google.com/coral/python/tflite_runtime-2.1.0.post1-cp38-cp38-linux_x86_64.whl \
-    && python3.8 -m pip install tflite_runtime-2.1.0.post1-cp38-cp38-linux_x86_64.whl \
-    && rm tflite_runtime-2.1.0.post1-cp38-cp38-linux_x86_64.whl \
     && rm -rf /var/lib/apt/lists/* \
     && (apt-get autoremove -y; apt-get autoclean -y)