6.8.0

Author: lbr38

Dockerfile

@@ -0,0 +1,127 @@
+# Dockerfile for motion-UI
+
+# Base image
+FROM debian:12-slim
+
+# Metadata
+LABEL version="1.0" maintainer="lbr38 <motionui@protonmail.com>"
+
+# Variables
+ARG WWW_DIR="/var/www/motionui"
+ARG DATA_DIR="/var/lib/motionui"
+ARG PHP_VERSION="8.3"
+ARG DEBIAN_FRONTEND=noninteractive
+ARG branch=main
+
+# Export branch as environment variable for /init script
+ENV BRANCH=${branch}
+
+# PACKAGES INSTALL
+# Add repositories
+ADD https://packages.repomanager.net/repo/gpgkeys/packages.repomanager.net.pub /tmp/packages.repomanager.net.gpg
+RUN apt-get update -y -qq && apt-get install -y -qq gnupg2 ca-certificates && rm -rf /var/lib/apt/lists/* && \
+    cat /tmp/packages.repomanager.net.gpg | gpg --dearmor > /etc/apt/trusted.gpg.d/packages.repomanager.net.gpg
+RUN echo "deb https://packages.repomanager.net/repo/deb/motionui-nginx/bookworm/nginx/prod bookworm nginx" > /etc/apt/sources.list.d/nginx.list && \
+    echo "deb https://packages.repomanager.net/repo/deb/motionui-php/bookworm/main/prod bookworm main" > /etc/apt/sources.list.d/php.list && \
+    echo "deb https://packages.repomanager.net/repo/deb/go2rtc/all/main/prod all main" > /etc/apt/sources.list.d/go2rtc.list
+    # TODO: when motion 5.x.x package is released, use it instead
+    # echo "deb https://packages.repomanager.net/repo/motion/bookworm/main_prod bookworm main" > /etc/apt/sources.list.d/motion.list
+
+# Install dependencies
+RUN apt-get update -y -qq && \
+    apt-get install -y -qq findutils iputils-ping apt-transport-https dnsutils vim ffmpeg mediainfo postfix python3-psutil \
+    # Install postfix
+    postfix \
+    # Install motion (standby until motion is releasing a package for version 5.x.x)
+    # motion \
+    # Install go2rtc
+    go2rtc \
+    # Install motion dependencies - TODO: when motion 5.x.x package is released, use it instead
+    autoconf automake autopoint build-essential pkgconf libtool libzip-dev libjpeg-dev git libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavdevice-dev libwebp-dev gettext libmicrohttpd-dev libcamera-tools libcamera-dev libcamera-v4l2 \
+    # Install nginx and PHP 8.3
+    nginx php${PHP_VERSION}-fpm php${PHP_VERSION}-cli php${PHP_VERSION}-sqlite3 php${PHP_VERSION}-curl php${PHP_VERSION}-yaml php${PHP_VERSION}-opcache php${PHP_VERSION}-xml sqlite3 \
+    # Install xdebug if branch is devel
+    $(if [ "$branch" = "devel" ]; then echo "php${PHP_VERSION}-xdebug"; fi) && \
+    apt-get -qq autoremove -y && rm -rf /var/lib/apt/lists/*
+
+# Build motion from sources
+# TODO: when motion 5.x.x package is released, use it instead
+RUN git clone https://github.com/Motion-Project/motion.git && cd motion && autoreconf -fiv && ./configure --prefix=/usr --sysconfdir=/etc && make && make install && cd .. && rm motion -r
+
+# SERVICES CONFIG
+# Configure Nginx
+RUN rm -rf /etc/nginx/sites-enabled/default /etc/nginx/conf.d/default.conf /var/www/html
+COPY docker/config/nginx/nginx.conf /etc/nginx/nginx.conf
+COPY docker/config/nginx/motionui.conf /etc/nginx/sites-enabled/motionui.conf
+
+# Configure PHP
+COPY docker/config/php/www.conf /etc/php/8.3/fpm/pool.d/www.conf
+
+# Configure Postfix
+COPY docker/config/postfix/main.cf /etc/postfix/main.cf
+# Copy master.cf with custom listening port 2525 (to avoid conflict with other mail services on the host)
+COPY docker/config/postfix/master.cf /etc/postfix/master.cf
+
+# Copy motionui files
+RUN mkdir -p $WWW_DIR $DATA_DIR
+COPY www/ $WWW_DIR/
+
+# Create motionui group and set basic permissions
+RUN groupadd motionui && \
+    usermod -a -G motionui www-data
+# RUN chown -R www-data:motionui $WWW_DIR $DATA_DIR
+
+# Configure motion
+RUN mkdir -p /var/log/motion /var/run/motion && \
+    chown -R www-data:motionui /var/log/motion /var/run/motion && \
+    chmod 775 /var/log/motion /var/run/motion && \
+    # New main directory is /usr/var/lib/motion
+    rm /usr/var/lib/motion/* -fr && \
+    mkdir -p /usr/var/lib/motion && \
+    chown -R www-data:motionui /usr/var/lib/motion && \
+    chmod 770 /usr/var/lib/motion && \
+    # Create a symbolic link to /etc/motion to keep compatibility
+    ln -s /usr/var/lib/motion /etc/motion
+
+# Copy motion main config file
+COPY www/templates/motion/motion.conf /etc/motion/motion.conf
+
+# Copy motion event bin files
+RUN mkdir -p /usr/lib/motion
+COPY www/bin/on_event* /usr/lib/motion/
+RUN chown -R www-data:motionui /usr/lib/motion
+
+# Copy motion init script
+COPY docker/config/motion/init /etc/init.d/motion
+RUN chmod 755 /etc/init.d/motion
+
+# Some basic configurations
+RUN sed -i 's/# alias ll=/alias ll=/g' /root/.bashrc && \
+    echo "set ic" > /root/.vimrc && \
+    echo "set mouse-=a" >> /root/.vimrc && \
+    echo "syntax on" >> /root/.vimrc && \
+    echo "set background=dark" >> /root/.vimrc && \
+    # SQLite
+    echo ".headers on" > /root/.sqliterc && \
+    echo ".mode column" >> /root/.sqliterc
+
+# Setup go2rtc
+
+# Copy go2rtc init script
+COPY docker/config/go2rtc/init /etc/init.d/go2rtc
+RUN chmod 755 /etc/init.d/go2rtc && \
+    mkdir -p /var/run/go2rtc && \
+    chown -R www-data:motionui /var/run/go2rtc && \
+    chmod 775 /var/run/go2rtc
+
+# Copy entrypoint script
+COPY docker/init /init
+RUN chmod 700 /init
+
+# Expose port 8080
+EXPOSE 8080
+
+# Set working dir
+WORKDIR ${DATA_DIR}
+
+ENTRYPOINT ["/init"]

README.md

@@ -66,7 +66,11 @@ It should help you **installing** and starting using motion-UI.
 
 ## 📱 Android app
 
-An Android app is available for download <a href="https://github.com/lbr38/motion-UI/releases/tag/android-1.0.0">here</a> (in the assets section).
+Get the android app to visualize your cameras and manage your motion-UI instance on your smartphone.
+
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+    alt="Get it on F-Droid"
+    height="80">](https://f-droid.org/packages/app.motionui.android)
 
 ## 📧 Contact
 

docker/docker-compose-dev.yml renamed to docker-compose-dev.yml

@@ -7,12 +7,13 @@ services:
     image: motionui-image
     privileged: true
     network_mode: host
+    environment:
+      FQDN: motionui-dev.localhost
     build:
       context: .
       dockerfile: Dockerfile
       args:
-        env: devel
-        fqdn: motionui-dev.localhost
+        branch: devel
     restart: unless-stopped
     volumes:
       - /etc/localtime:/etc/localtime:ro

docker/docker-compose.yml renamed to docker-compose.yml

@@ -6,12 +6,13 @@ services:
     image: motionui-image
     privileged: true
     network_mode: host
+    environment:
+      FQDN: motionui.example.com
     build:
       context: .
       dockerfile: Dockerfile
       args:
-        env: prod
-        fqdn: motionui.example.com
+        branch: main
     restart: unless-stopped
     volumes:
       - /etc/localtime:/etc/localtime:ro