Set capabilities for domoticz binary and move cmake from edge repo (#61)

Set capabilities for domoticz binary and move cmake from edge repo

Author: j0nnymoe

Dockerfile

@@ -21,6 +21,7 @@ RUN \
 	automake \
 	binutils \
 	boost-dev \
+	cmake \
 	confuse-dev \
 	curl-dev \
 	doxygen \
@@ -44,9 +45,6 @@ RUN \
 	sqlite-dev \
 	tar \
 	zlib-dev && \
- echo "**** install build packages from edge****" && \
- apk add --no-cache --virtual=build-dependencies-edge --repository http://dl-3.alpinelinux.org/alpine/edge/main/ \
-	cmake && \
  echo "**** install runtime packages ****" && \
  apk add --no-cache \
 	boost \
@@ -133,8 +131,7 @@ RUN \
  usermod -a -G 16,20 abc && \
  echo " **** cleanup ****" && \
  apk del --purge \
-	build-dependencies \
-	build-dependencies-edge && \
+	build-dependencies && \
  rm -rf \
 	/tmp/* \
 	/usr/lib/libftdi* \

Dockerfile.aarch64

@@ -21,6 +21,7 @@ RUN \
 	automake \
 	binutils \
 	boost-dev \
+	cmake \
 	confuse-dev \
 	curl-dev \
 	doxygen \
@@ -44,9 +45,6 @@ RUN \
 	sqlite-dev \
 	tar \
 	zlib-dev && \
- echo "**** install build packages from edge****" && \
- apk add --no-cache --virtual=build-dependencies-edge --repository http://dl-3.alpinelinux.org/alpine/edge/main/ \
-	cmake && \
  echo "**** install runtime packages ****" && \
  apk add --no-cache \
 	boost \
@@ -133,8 +131,7 @@ RUN \
  usermod -a -G 16,20 abc && \
  echo " **** cleanup ****" && \
  apk del --purge \
-	build-dependencies \
-	build-dependencies-edge && \
+	build-dependencies && \
  rm -rf \
 	/tmp/* \
 	/usr/lib/libftdi* \

Dockerfile.armhf

@@ -21,6 +21,7 @@ RUN \
 	automake \
 	binutils \
 	boost-dev \
+	cmake \
 	confuse-dev \
 	curl-dev \
 	doxygen \
@@ -44,9 +45,6 @@ RUN \
 	sqlite-dev \
 	tar \
 	zlib-dev && \
- echo "**** install build packages from edge****" && \
- apk add --no-cache --virtual=build-dependencies-edge --repository http://dl-3.alpinelinux.org/alpine/edge/main/ \
-	cmake && \
  echo "**** install runtime packages ****" && \
  apk add --no-cache \
 	boost \
@@ -133,8 +131,7 @@ RUN \
  usermod -a -G 16,20 abc && \
  echo " **** cleanup ****" && \
  apk del --purge \
-	build-dependencies \
-	build-dependencies-edge && \
+	build-dependencies && \
  rm -rf \
 	/tmp/* \
 	/usr/lib/libftdi* \

README.md

@@ -226,6 +226,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **03.11.19:** - Set capabilities for domoticz binary and move cmake from edge repo.
 * **28.06.19:** - Rebasing to alpine 3.10. Add iputils for ping. Fix typo in readme. Fix permissions for custom icons.
 * **12.05.19:** - Add boost dependencies and turn off static boost build. Bump to Alpine 3.9.
 * **30.03.19:** - Add env variable to set webroot.

readme-vars.yml

@@ -75,6 +75,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "03.11.19:", desc: "Set capabilities for domoticz binary and move cmake from edge repo." }
   - { date: "28.06.19:", desc: "Rebasing to alpine 3.10. Add iputils for ping. Fix typo in readme. Fix permissions for custom icons." }
   - { date: "12.05.19:", desc: "Add boost dependencies and turn off static boost build. Bump to Alpine 3.9." }
   - { date: "30.03.19:", desc: "Add env variable to set webroot." }

root/etc/services.d/domoticz/run

@@ -2,6 +2,9 @@
 
 IFS=" " read -r -a RUN_ARRAY <<< "$WEBROOT"
 
+# set capabilities for domoticz binary
+setcap cap_net_raw=+eip /var/lib/domoticz/domoticz
+
 exec \
 	s6-setuidgid abc /var/lib/domoticz/domoticz \
 		-sslwww 1443 \