From cfea7dd783d0bb4d97ef01f05fbcd489f1df6b52 Mon Sep 17 00:00:00 2001 From: kev Date: Fri, 28 Oct 2022 15:47:11 +0800 Subject: [PATCH] update --- README.md | 2 +- {motion-arm => motion-arm64}/Dockerfile | 15 ++++++--------- {motion-arm => motion-arm64}/README.md | 11 +++++++---- {motion-arm => motion-arm64}/data/etc/motion.conf | 0 motion-arm64/data/var/.gitkeep | 0 {motion-arm => motion-arm64}/docker-compose.yml | 2 +- wireguard/README.md | 5 ++++- wireguard/docker-compose.yml | 5 +++-- 8 files changed, 22 insertions(+), 18 deletions(-) rename {motion-arm => motion-arm64}/Dockerfile (57%) rename {motion-arm => motion-arm64}/README.md (94%) rename {motion-arm => motion-arm64}/data/etc/motion.conf (100%) create mode 100644 motion-arm64/data/var/.gitkeep rename {motion-arm => motion-arm64}/docker-compose.yml (90%) diff --git a/README.md b/README.md index 8d93f2e..9285e3a 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ A collection of delicious docker recipes. - [x] monit - [x] moodle :beetle: - [x] mosquitto -- [x] motion-arm :+1: +- [x] motion-arm64 :+1: - [x] ndscheduler - [x] nfs - [x] nginx diff --git a/motion-arm/Dockerfile b/motion-arm64/Dockerfile similarity index 57% rename from motion-arm/Dockerfile rename to motion-arm64/Dockerfile index 6d81725..f4dc43e 100644 --- a/motion-arm/Dockerfile +++ b/motion-arm64/Dockerfile @@ -2,20 +2,17 @@ # Dockerfile for motion-arm # -FROM debian:buster +FROM debian:bullseye MAINTAINER EasyPi Software Foundation -ENV MOTION_VERSION=4.4.0 -ENV MOTION_FILE=pi_buster_motion_${MOTION_VERSION}-1_armhf.deb -ENV MOTION_URL=https://github.com/Motion-Project/motion/releases/download/release-${MOTION_VERSION}/${MOTION_FILE} +ARG MOTION_VERSION=4.4.0 +ARG MOTION_CODENAME=bullseye +ARG MOTION_FILE=${MOTION_CODENAME}_motion_${MOTION_VERSION}-1_arm64.deb +ARG MOTION_URL=https://github.com/Motion-Project/motion/releases/download/release-${MOTION_VERSION}/${MOTION_FILE} RUN set -xe \ && apt-get update \ - && apt-get install -y curl gnupg mosquitto-clients openssh-client \ - && echo "deb http://archive.raspberrypi.org/debian/ buster main" > /etc/apt/sources.list.d/raspi.list \ - && curl -sSL "http://archive.raspberrypi.org/debian/raspberrypi.gpg.key" | apt-key add - \ - && apt-get update \ - && apt-get install -y libraspberrypi0 \ + && apt-get install -y curl mosquitto-clients openssh-client \ && curl -sSL ${MOTION_URL} -o ${MOTION_FILE} \ && (dpkg -i ${MOTION_FILE} || apt-get -f install -y) \ && sed -i -e 's/^daemon on/daemon off/' \ diff --git a/motion-arm/README.md b/motion-arm64/README.md similarity index 94% rename from motion-arm/README.md rename to motion-arm64/README.md index 64b7fc8..1ba912b 100644 --- a/motion-arm/README.md +++ b/motion-arm64/README.md @@ -13,7 +13,7 @@ other words, it can detect motion. version: "3.8" services: motion: - image: easypi/motion-arm + image: easypi/motion-arm64 ports: - "8080:8080" - "8081:8081" @@ -36,7 +36,7 @@ width 640 height 480 # set frame rate -framerate 5 +framerate 15 # disable image output output_pictures off @@ -45,7 +45,11 @@ output_pictures off ffmpeg_output_movies off # encode timelapse movie -ffmpeg_timelapse 60 +timelapse_interval 60 +timelapse_mode daily +timelapse_fps 30 +timelapse_codec mpg +timelapse_filename %Y%m%d-timelapse ``` Motion can work with Home-Assistant via [External Commands][2]. @@ -77,7 +81,6 @@ binary_sensor: ;on_movie_end curl -s -H 'X-HA-Access: ******' -H 'Content-Type: application/json' -d '{"state": "off", "attributes": {"friendly_name": "Motion", "device_class": "motion"}}' http://hass.easypi.pro:8123/api/states/binary_sensor.motion # MQTT ;on_movie_end mosquitto_pub -h mqtt.easypi.pro -u username -P password -r -t /pi/sensor/motion -m OFF - ``` Please read [this][3] to enable raspberry pi camera module. diff --git a/motion-arm/data/etc/motion.conf b/motion-arm64/data/etc/motion.conf similarity index 100% rename from motion-arm/data/etc/motion.conf rename to motion-arm64/data/etc/motion.conf diff --git a/motion-arm64/data/var/.gitkeep b/motion-arm64/data/var/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/motion-arm/docker-compose.yml b/motion-arm64/docker-compose.yml similarity index 90% rename from motion-arm/docker-compose.yml rename to motion-arm64/docker-compose.yml index 320807d..cf8bc53 100644 --- a/motion-arm/docker-compose.yml +++ b/motion-arm64/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: motion: - image: easypi/motion-arm + image: easypi/motion-arm64 ports: - "8080:8080" - "8081:8081" diff --git a/wireguard/README.md b/wireguard/README.md index 5797199..62373ff 100644 --- a/wireguard/README.md +++ b/wireguard/README.md @@ -1,7 +1,10 @@ wireguard ========= -[WireGuard®][1] is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography. It aims to be faster, simpler, leaner, and more useful than IPsec, while avoiding the massive headache. It intends to be considerably more performant than OpenVPN. +[WireGuard®][1] is an extremely simple yet fast and modern VPN that utilizes +state-of-the-art cryptography. It aims to be faster, simpler, leaner, and more +useful than IPsec, while avoiding the massive headache. It intends to be +considerably more performant than OpenVPN. ## Up and Running diff --git a/wireguard/docker-compose.yml b/wireguard/docker-compose.yml index c6991c9..6e5abce 100644 --- a/wireguard/docker-compose.yml +++ b/wireguard/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: wireguard: - image: ghcr.io/linuxserver/wireguard + image: linuxserver/wireguard container_name: wireguard cap_add: - NET_ADMIN @@ -14,8 +14,9 @@ services: - SERVERPORT=51820 - PEERS=3 - PEERDNS=auto - - INTERNAL_SUBNET=10.18.18.0 + - INTERNAL_SUBNET=10.13.13.0 - ALLOWEDIPS=0.0.0.0/0 + - LOG_CONFS=true volumes: - ./data:/config - /lib/modules:/lib/modules