update

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

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
+ARG MOTION_VERSION=4.4.0
-ENV MOTION_FILE=pi_buster_motion_${MOTION_VERSION}-1_armhf.deb
+ARG MOTION_CODENAME=bullseye
-ENV MOTION_URL=https://github.com/Motion-Project/motion/releases/download/release-${MOTION_VERSION}/${MOTION_FILE}
+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 \
+    && apt-get install -y curl 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 \
     && curl -sSL ${MOTION_URL} -o ${MOTION_FILE} \
     && (dpkg -i ${MOTION_FILE} || apt-get -f install -y) \
     && sed -i -e 's/^daemon on/daemon off/' \

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.

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"

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

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