Merge from master.

Makefile

@@ -109,21 +109,12 @@ include build/ab.mk
 
 DOCKERFILES = \
 	debian11 \
-    debian12
+    debian12 \
+    fedora40 \
+    fedora41
 
-define run-docker
+docker-%: tests/docker/Dockerfile.%
-    docker build -t $1 -f tests/docker/Dockerfile.$(strip $1) .
+	docker build -t $* -f $< .
-    docker run \
-        --device=/dev/kvm \
-        --rm \
-        --attach STDOUT \
-                --attach STDERR \
-        $1 \
-        make
-
-endef
 
 .PHONY: dockertests
-dockertests:
+dockertests: $(foreach f,$(DOCKERFILES), docker-$(strip $f) .WAIT)
-	$(hide) echo DOCKERTESTS
-	$(foreach f,$(DOCKERFILES), $(call run-docker, $f))

tests/docker/Dockerfile.debian11

@@ -28,4 +28,4 @@ COPY --chown=app:app config.py .
 COPY --chown=app:app protocol.h .
 COPY --chown=app:app README.md .
 
-
+RUN make

tests/docker/Dockerfile.debian12

@@ -28,4 +28,4 @@ COPY --chown=app:app config.py .
 COPY --chown=app:app protocol.h .
 COPY --chown=app:app README.md .
 
-
+RUN make

tests/docker/Dockerfile.fedora40

@@ -0,0 +1,32 @@
+FROM fedora:40
+
+RUN dnf update -y
+RUN dnf -y install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-40.noarch.rpm
+RUN dnf -y install https://github.com/rpmsphere/noarch/raw/master/r/rpmsphere-release-40-1.noarch.rpm
+RUN dnf -y install \
+    protobuf-compiler protobuf-devel sqlite-devel libudev-devel \
+    wxGTK-devel gcc gcc-c++ fmt-devel png2ico
+
+RUN useradd app
+RUN mkdir -p /home/app
+RUN chown app /home/app
+USER app
+WORKDIR /home/app
+
+COPY --chown=app:app arch arch
+COPY --chown=app:app build build
+COPY --chown=app:app dep dep
+COPY --chown=app:app doc doc
+COPY --chown=app:app extras extras
+COPY --chown=app:app lib lib
+COPY --chown=app:app scripts scripts
+COPY --chown=app:app src src
+COPY --chown=app:app tests tests
+COPY --chown=app:app tools tools
+COPY --chown=app:app Makefile .
+COPY --chown=app:app build.py .
+COPY --chown=app:app config.py .
+COPY --chown=app:app protocol.h .
+COPY --chown=app:app README.md .
+
+RUN make

tests/docker/Dockerfile.fedora41

@@ -0,0 +1,32 @@
+FROM fedora:41
+
+RUN dnf update -y
+RUN dnf -y install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-41.noarch.rpm
+RUN dnf -y install https://github.com/rpmsphere/noarch/raw/master/r/rpmsphere-release-40-1.noarch.rpm
+RUN dnf -y install \
+    protobuf-compiler protobuf-devel sqlite-devel libudev-devel \
+    wxGTK-devel gcc gcc-c++ fmt-devel png2ico
+
+RUN useradd app
+RUN mkdir -p /home/app
+RUN chown app /home/app
+USER app
+WORKDIR /home/app
+
+COPY --chown=app:app arch arch
+COPY --chown=app:app build build
+COPY --chown=app:app dep dep
+COPY --chown=app:app doc doc
+COPY --chown=app:app extras extras
+COPY --chown=app:app lib lib
+COPY --chown=app:app scripts scripts
+COPY --chown=app:app src src
+COPY --chown=app:app tests tests
+COPY --chown=app:app tools tools
+COPY --chown=app:app Makefile .
+COPY --chown=app:app build.py .
+COPY --chown=app:app config.py .
+COPY --chown=app:app protocol.h .
+COPY --chown=app:app README.md .
+
+RUN make