Updates for Docker

- Fix compilation for fppinit, it needs jsoncpp
- Utilize all CPUs for compiling
- Add note about seccomp to docker-compose.yml.
  Newer seccomp was preventing FPP in newer docker image from
  compiling on older docker versions and possible other issues.
  The solution is to upgrade docker or ignore/bypass seccomp error.

Author: cpinkham

Docker/docker-compose.yml

@@ -39,6 +39,15 @@ services:
     image: falconchristmas/fpp:latest
     restart: always
 
+    # If you have an issue starting the container on older versions of docker, you may need to bypass or update
+    # seccomp.  Either set seccomp to unconfined or download/create a seccomp.json file with the defaultAction
+    # set to SCMP_ACT_TRACE.  Uncomment the security_opt line and one of the seccomp lines below.  This issue
+    # may be indicated by a lot of "make: /bin/sh: Operation not permitted" lines in the docker logs.
+    #security_opt:
+    #  - seccomp:unconfined
+    #  - seccomp:your_seccomp_file.json
+
+
     # FPP will report this hostname via MultiSync
     hostname: fpp-docker
 

Docker/runDocker.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
-if [ ! -f /opt/fpp/src/fpp ]; then
+if [ ! -f /opt/fpp/src/fppinit ]; then
     cd /opt/fpp/src
-    make -j 4
+    CPUS=$(/opt/fpp/scripts/functions ComputeMakeParallelism)
+    make -j ${CPUS}
 fi
+
 /opt/fpp/src/fppinit start
 /opt/fpp/scripts/fppd_start
 

src/makefiles/fppinit.mk

@@ -4,11 +4,12 @@ OBJECTS_fppinit += \
 
 TARGETS += fppinit
 OBJECTS_ALL+=$(OBJECTS_fppinit)
+LIBS_fppinit = -ljsoncpp
 
 ifeq '$(BUILD_FPPCAPEDETECT)' '1'
 CXXFLAGS_boot/FPPINIT.o+=-DCAPEDETECT=1
-LIBS_fppinit = \
-	-L. -ljsoncpp -lcrypto -Wl,-rpath=$(SRCDIR):.
+LIBS_fppinit += \
+	-L. -lcrypto -Wl,-rpath=$(SRCDIR):.
 FPPINIT_DEPS=libfpp_capeutils.so
 endif