Merge branch 'master' into dockerbuildtest

# Conflicts:
#	contrib/docker/Dockerfile.arm32v5
#	contrib/docker/Dockerfile.arm32v7
#	make_debian.sh

ChangeLog.md

@@ -1,12 +1,32 @@
-# 21.3 (tbd)
+# 21.3 (2021-11-07)
 
 ## Bug Fixes
 * fix for escaping double quote in CSV format
 * adjusted helper shell scripts and Munin plugin to newer netcat
 * fix for weekday in BDA data type (for sending only)
+* fix some compiler warnings
+* fix non-unique message keys in HTTP JSON output with "full" query parameter
+* fix for message after debian install
+* fix for replacing already existing message definitions
+* fix missing length in CSV dump for some data types
+* fix some missing data type lengths in "grab decode" result
+* fix for injecting several messages via command line args
 
 ## Features
 * added DTM and BDZ data types
+* added "-n" argument to "hex" and "direct" commands for automatically determining message length from input
+* added level/pollprio/condition/field flags and field result type as well as list of types to HTTP JSON output
+* added message dump from commandline in JSON format
+* added support for newer MQTT broker versions
+* added some PIC calibration data to "ebuspicloader" verbose output
+* added support for upcoming adapter 3 firmware enhancements
+* added config override path
+* added support for adding message definition, retrieving data types and raw messages, and decode data types from raw values to HTTP port
+* added "--mqttverbose" option
+* added verbose option to "info" command
+
+## Breaking Changes
+* remove support for Debian 8 Jessie in docker
 
 
 # 21.2 (2021-02-08)

VERSION

@@ -1 +1 @@
-21.2
+21.3

contrib/archlinux/PKGBUILD

@@ -2,7 +2,7 @@
 # Contributor: Milan Knizek <knizek volny cz>
 # Usage: makepkg
 pkgname=ebusd
-pkgver=21.2
+pkgver=21.3
 pkgrel=1
 pkgdesc="ebusd, the daemon for communication with eBUS heating systems."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')

contrib/archlinux/PKGBUILD.git

@@ -3,7 +3,7 @@
 # Usage: makepkg -p PKGBUILD.git
 pkgname=ebusd-git
 _gitname=ebusd
-pkgver=21.2
+pkgver=21.3
 pkgrel=1
 pkgdesc="ebusd, the daemon for communication with eBUS heating systems."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')

contrib/docker/Dockerfile

@@ -1,5 +1,6 @@
+ARG BASE_IMAGE
 
-FROM debian:bullseye as build
+FROM $BASE_IMAGE as build
 
 RUN apt-get update && apt-get install -y \
     libmosquitto-dev libstdc++6 libc6 libgcc1 \
@@ -9,25 +10,34 @@ RUN apt-get update && apt-get install -y \
 
 WORKDIR /build
 
-ENV EBUSD_ARCH amd64
-ENV EBUSD_VERSION 21.2
+ARG TARGETARCH
+ARG TARGETVARIANT
+ARG EBUSD_VERSION
 
-RUN git clone https://github.com/john30/ebusd.git /build \
-    && ./make_debian.sh
+ENV EBUSD_ARCH $TARGETARCH$TARGETVARIANT
+ENV EBUSD_VERSION $EBUSD_VERSION
 
+ADD . /build
+RUN ./make_debian.sh
 
 
 
-FROM debian:bullseye-slim
+
+FROM $BASE_IMAGE-slim as image
 
 RUN apt-get update && apt-get install -y \
-    logrotate libmosquitto1 libstdc++6 libc6 libgcc1 \
+    libmosquitto1 libstdc++6 libc6 libgcc1 \
     && rm -rf /var/lib/apt/lists/*
 
 LABEL maintainer "[email protected]"
 
-ENV EBUSD_VERSION 21.2
-ENV EBUSD_ARCH amd64
+ARG TARGETARCH
+ARG TARGETVARIANT
+ARG EBUSD_VERSION
+ARG EBUSD_IMAGE
+
+ENV EBUSD_ARCH $TARGETARCH$TARGETVARIANT
+ENV EBUSD_VERSION $EBUSD_VERSION
 
 LABEL version "${EBUSD_VERSION}-${EBUSD_ARCH}-devel"
 
@@ -39,6 +49,6 @@ RUN dpkg -i ebusd.deb \
 
 EXPOSE 8888
 
-COPY docker-entrypoint.sh /
+COPY --from=build /build/contrib/docker/docker-entrypoint.sh /
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["-f", "--scanconfig"]

contrib/docker/Dockerfile.release

@@ -1,5 +1,6 @@
+ARG BASE_IMAGE
 
-FROM debian:bullseye as build
+FROM $BASE_IMAGE as build
 
 RUN apt-get update && apt-get install -y \
     libmosquitto-dev libstdc++6 libc6 libgcc1 \
@@ -9,36 +10,45 @@ RUN apt-get update && apt-get install -y \
 
 WORKDIR /build
 
-ENV EBUSD_ARCH amd64
-ENV EBUSD_VERSION 21.2
+ARG TARGETARCH
+ARG TARGETVARIANT
+ARG EBUSD_VERSION
 
-RUN git clone https://github.com/john30/ebusd.git /build \
-    && ./make_debian.sh
+ENV EBUSD_ARCH $TARGETARCH$TARGETVARIANT
+ENV EBUSD_VERSION $EBUSD_VERSION
 
+ADD . /build
+RUN ./make_debian.sh
 
 
 
-FROM debian:bullseye-slim
+
+FROM $BASE_IMAGE-slim as image
 
 RUN apt-get update && apt-get install -y \
-    logrotate libmosquitto1 libstdc++6 libc6 libgcc1 \
+    libmosquitto1 libstdc++6 libc6 libgcc1 \
     && rm -rf /var/lib/apt/lists/*
 
 LABEL maintainer "[email protected]"
 
-ENV EBUSD_VERSION 21.2
-ENV EBUSD_ARCH amd64
+ARG TARGETARCH
+ARG TARGETVARIANT
+ARG EBUSD_VERSION
+ARG EBUSD_IMAGE
+
+ENV EBUSD_ARCH $TARGETARCH$TARGETVARIANT
+ENV EBUSD_VERSION $EBUSD_VERSION
 
 LABEL version "${EBUSD_VERSION}-${EBUSD_ARCH}"
 
-COPY --from=build /build/ebusd-*_mqtt1.deb ebusd.deb
+ADD https://github.com/john30/ebusd/releases/download/v${EBUSD_VERSION}/ebusd-${EBUSD_VERSION}_${TARGETARCH}${TARGETVARIANT}-${EBUSD_IMAGE}_mqtt1.deb ebusd.deb
 
 RUN dpkg -i ebusd.deb \
     && ebusd -V \
     && rm -f ebusd.deb
 
 EXPOSE 8888
 
-COPY docker-entrypoint.sh /
+COPY contrib/docker/docker-entrypoint.sh /
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["-f", "--scanconfig"]