arch specific s6-overlay

docker/Dockerfile.aarch64

@@ -5,18 +5,26 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Install packages for apt repo
 RUN apt-get -qq update \
     && apt-get -qq install --no-install-recommends -y \
-        # ffmpeg runtime dependencies
-        libgomp1 \
-        # runtime dependencies
-        libopenexr24 \
-        libgstreamer1.0-0 \
-        libgstreamer-plugins-base1.0-0 \
-        libopenblas-base \
-        libjpeg-turbo8 \
-        libpng16-16 \
-        libtiff5 \
-        libdc1394-22 \
+    # ffmpeg runtime dependencies
+    libgomp1 \
+    # runtime dependencies
+    libopenexr24 \
+    libgstreamer1.0-0 \
+    libgstreamer-plugins-base1.0-0 \
+    libopenblas-base \
+    libjpeg-turbo8 \
+    libpng16-16 \
+    libtiff5 \
+    libdc1394-22 \
     ## Tensorflow lite
     && pip3 install https://github.com/google-coral/pycoral/releases/download/release-frogfish/tflite_runtime-2.5.0-cp38-cp38-linux_aarch64.whl \
     && rm -rf /var/lib/apt/lists/* \
-    && (apt-get autoremove -y; apt-get autoclean -y)
+    && (apt-get autoremove -y; apt-get autoclean -y)
+
+# s6-overlay
+ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-aarch64-installer /tmp/
+RUN chmod +x /tmp/s6-overlay-aarch64-installer && /tmp/s6-overlay-aarch64-installer /
+
+ENTRYPOINT ["/init"]
+
+CMD ["python3", "-u", "-m", "frigate"]

docker/Dockerfile.amd64

@@ -21,4 +21,12 @@ RUN apt-get -qq update \
     && python3.8 -m pip install tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \
     && rm tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \
     && rm -rf /var/lib/apt/lists/* \
-    && (apt-get autoremove -y; apt-get autoclean -y)
+    && (apt-get autoremove -y; apt-get autoclean -y)
+
+# s6-overlay
+ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-amd64-installer /tmp/
+RUN chmod +x /tmp/s6-overlay-amd64-installer && /tmp/s6-overlay-amd64-installer /
+
+ENTRYPOINT ["/init"]
+
+CMD ["python3", "-u", "-m", "frigate"]

docker/Dockerfile.amd64nvidia

@@ -4,9 +4,9 @@ LABEL maintainer "blakeb@blakeshome.com"
 # Install packages for apt repo
 RUN apt-get -qq update \
     && apt-get -qq install --no-install-recommends -y \
-        # ffmpeg dependencies
-        libgomp1 \
-        ## Tensorflow lite
+    # ffmpeg dependencies
+    libgomp1 \
+    ## Tensorflow lite
     && wget -q https://github.com/google-coral/pycoral/releases/download/release-frogfish/tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \
     && python3.8 -m pip install tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \
     && rm tflite_runtime-2.5.0-cp38-cp38-linux_x86_64.whl \
@@ -45,3 +45,11 @@ ENV LD_LIBRARY_PATH /usr/local/nvidia/lib:/usr/local/nvidia/lib64
 ENV NVIDIA_VISIBLE_DEVICES all
 ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
 ENV NVIDIA_REQUIRE_CUDA "cuda>=11.1 brand=tesla,driver>=418,driver<419 brand=tesla,driver>=440,driver<441 brand=tesla,driver>=450,driver<451"
+
+# s6-overlay
+ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-amd64-installer /tmp/
+RUN chmod +x /tmp/s6-overlay-amd64-installer && /tmp/s6-overlay-amd64-installer /
+
+ENTRYPOINT ["/init"]
+
+CMD ["python3", "-u", "-m", "frigate"]

docker/Dockerfile.armv7

@@ -5,20 +5,28 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Install packages for apt repo
 RUN apt-get -qq update \
     && apt-get -qq install --no-install-recommends -y \
-        # ffmpeg runtime dependencies
-        libgomp1 \
-        # runtime dependencies
-        libopenexr24 \
-        libgstreamer1.0-0 \
-        libgstreamer-plugins-base1.0-0 \
-        libopenblas-base \
-        libjpeg-turbo8 \
-        libpng16-16 \
-        libtiff5 \
-        libdc1394-22 \
-        libaom0 \
-        libx265-179 \
+    # ffmpeg runtime dependencies
+    libgomp1 \
+    # runtime dependencies
+    libopenexr24 \
+    libgstreamer1.0-0 \
+    libgstreamer-plugins-base1.0-0 \
+    libopenblas-base \
+    libjpeg-turbo8 \
+    libpng16-16 \
+    libtiff5 \
+    libdc1394-22 \
+    libaom0 \
+    libx265-179 \
     ## Tensorflow lite
     && pip3 install https://github.com/google-coral/pycoral/releases/download/release-frogfish/tflite_runtime-2.5.0-cp38-cp38-linux_armv7l.whl \
     && rm -rf /var/lib/apt/lists/* \
-    && (apt-get autoremove -y; apt-get autoclean -y)
+    && (apt-get autoremove -y; apt-get autoclean -y)
+
+# s6-overlay
+ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-armhf-installer /tmp/
+RUN chmod +x /tmp/s6-overlay-armhf-installer && /tmp/s6-overlay-armhf-installer /
+
+ENTRYPOINT ["/init"]
+
+CMD ["python3", "-u", "-m", "frigate"]

docker/Dockerfile.base

@@ -10,10 +10,6 @@ FROM frigate-web as web
 FROM ubuntu:20.04
 LABEL maintainer "blakeb@blakeshome.com"
 
-# s6-overlay
-ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.1/s6-overlay-amd64-installer /tmp/
-RUN chmod +x /tmp/s6-overlay-amd64-installer && /tmp/s6-overlay-amd64-installer /
-
 COPY --from=ffmpeg /usr/local /usr/local/
 
 COPY --from=wheels /wheels/. /wheels/
@@ -57,7 +53,3 @@ COPY docker/rootfs/ /
 
 EXPOSE 5000
 EXPOSE 1935
-
-ENTRYPOINT ["/init"]
-
-CMD ["python3", "-u", "-m", "frigate"]