Rebase to ubuntu and use pre-built binaries

Author: tobbenb

.github/ISSUE_TEMPLATE.md

@@ -2,11 +2,11 @@
 
 [linuxserverurl]: https://linuxserver.io
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
-
+	
 
 <!--- Before submitting a pull request please check the following -->
 
-<!---  If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR  -->
+<!---  If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR  --> 
 <!---  Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
 <!---  That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message   -->
 <!---  You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
@@ -21,11 +21,7 @@
 
 ------------------------------
 
- - [ ] I have read the [contributing](https://github.com/linuxserver/docker-domoticz/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
-
-------------------------------
-
-<!--- We welcome all PR’s though this doesn’t guarantee it will be accepted. -->
+We welcome all PR’s though this doesn’t guarantee it will be accepted.
 
 ## Description:
 <!--- Describe your changes in detail -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,6 +8,6 @@ jobs:
     steps:
     - uses: actions/first-interaction@v1
       with:
-        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-domoticz/blob/master/.github/ISSUE_TEMPLATE.md)!'
-        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-domoticz/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
+        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-domoticz/.github/ISSUE_TEMPLATE.md)!'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-domoticz/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/greetings.yml

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:3.10
+FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
 
 # set version label
 ARG BUILD_DATE
@@ -8,126 +8,59 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="saarg"
 
 # environment settings
+ARG DEBIAN_FRONTEND="noninteractive"
 ENV HOME="/config"
 
-# copy prebuilds
-COPY patches/ /
-
 RUN \
- echo "**** install build packages ****" && \
- apk add --no-cache --virtual=build-dependencies \
-	argp-standalone \
-	autoconf \
-	automake \
-	binutils \
-	boost-dev \
-	cmake \
-	confuse-dev \
-	curl-dev \
-	doxygen \
-	eudev-dev \
-	g++ \
-	gcc \
-	git \
-	gzip \
-	libcurl \
-	libftdi1-dev \
-	libressl-dev \
-	libusb-compat-dev \
-	libusb-dev \
-	linux-headers \
-	make \
-	mosquitto-dev \
-	musl-dev \
-	openzwave-dev \
-	pkgconf \
-	sqlite-dev \
-	tar \
-	zlib-dev && \
  echo "**** install runtime packages ****" && \
- apk add --no-cache \
- 	boost \
-	boost-thread \
-	boost-system \
+ apt-get update && \
+ apt-get install -y --no-install-recommends \
 	curl \
-	eudev-libs \
-	iputils \
-	libressl \
-	openssh \
-	openzwave \
-	python3-dev && \
- echo "**** link libftdi libs ****" && \
- ln -s /usr/lib/libftdi1.so /usr/lib/libftdi.so && \
- ln -s /usr/lib/libftdi1.a /usr/lib/libftdi.a && \
- ln -s /usr/include/libftdi1/ftdi.h /usr/include/ftdi.h && \
- echo "**** build telldus-core ****" && \
- mkdir -p \
-	/tmp/telldus-core && \
- tar xf /tmp/patches/telldus-core-2.1.2.tar.gz -C \
-	/tmp/telldus-core --strip-components=1 && \
- curl -o /tmp/telldus-core/Doxyfile.in -L \
-	https://raw.githubusercontent.com/telldus/telldus/master/telldus-core/Doxyfile.in && \
- cp /tmp/patches/Socket_unix.cpp /tmp/telldus-core/common/Socket_unix.cpp && \
- cp /tmp/patches/ConnectionListener_unix.cpp /tmp/telldus-core/service/ConnectionListener_unix.cpp && \
- cp /tmp/patches/CMakeLists.txt /tmp/telldus-core/CMakeLists.txt && \
- cd /tmp/telldus-core && \
- cmake -DBUILD_TDADMIN=false -DCMAKE_INSTALL_PREFIX=/tmp/telldus-core . && \
- make && \
- echo "**** configure telldus core ****" && \
- mv /tmp/telldus-core/client/libtelldus-core.so.2.1.2 /usr/lib/libtelldus-core.so.2.1.2 && \
- mv /tmp/telldus-core/client/telldus-core.h /usr/include/telldus-core.h && \
- ln -s /usr/lib/libtelldus-core.so.2.1.2 /usr/lib/libtelldus-core.so.2 && \
- ln -s /usr/lib/libtelldus-core.so.2 /usr/lib/libtelldus-core.so && \
- echo "**** build domoticz ****" && \
+	cron \
+	libc6 \
+	libcap2-bin \
+	libcurl3-gnutls \
+	libcurl4 \
+	libpython3.8 \
+	libudev-dev \
+	libusb-0.1-4 \
+	mosquitto-clients \
+	python3-pip \
+	python3-requests \
+	unzip \
+	wget \
+	zlib1g && \
+ echo "**** link to python lib so domoticz finds it ****" && \
+ ln -s /usr/lib/x86_64-linux-gnu/libpython3.8.so.1.0 /usr/lib/x86_64-linux-gnu/libpython3.8.so && \
+ echo "**** install domoticz ****" && \
  if [ -z ${DOMOTICZ_RELEASE+x} ]; then \
- 	DOMOTICZ_RELEASE=$(curl -sX GET "https://api.github.com/repos/domoticz/domoticz/releases/latest" \
+	DOMOTICZ_RELEASE=$(curl -sX GET "https://api.github.com/repos/domoticz/domoticz/releases/latest" \
         | awk '/tag_name/{print $4;exit}' FS='[""]'); \
  fi && \
- git clone -b "${DOMOTICZ_RELEASE}" https://github.com/domoticz/domoticz.git /tmp/domoticz && \
- cd /tmp/domoticz && \
- cmake \
-	-DBUILD_SHARED_LIBS=True \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=/var/lib/domoticz \
-	-DOpenZWave=/usr/lib/libopenzwave.so \
-	-DUSE_BUILTIN_LUA=ON \
-	-DUSE_BUILTIN_MQTT=ON \
-	-DUSE_BUILTIN_SQLITE=OFF \
-	-DUSE_STATIC_BOOST=OFF \
-	-DUSE_STATIC_LIBSTDCXX=OFF \
-	-DUSE_STATIC_OPENZWAVE=OFF \
-	-Wno-dev && \
- make && \
- make install && \
- echo "**** install BroadlinkRM2 plugin dependencies ****" && \
- git clone https://github.com/mjg59/python-broadlink.git /tmp/python-broadlink && \
- cd /tmp/python-broadlink && \
- git checkout 8bc67af6 && \
- pip3 install . && \
- pip3 install pyaes && \
- echo "**** determine runtime packages using scanelf ****" && \
- RUNTIME_PACKAGES="$( \
-	scanelf --needed --nobanner /var/lib/domoticz/domoticz \
-	| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
-	| sort -u \
-	| xargs -r apk info --installed \
-	| sort -u \
-	)" && \
- apk add --no-cache \
-	$RUNTIME_PACKAGES && \
- echo "**** add abc to dialout and cron group ****" && \
- usermod -a -G 16,20 abc && \
+ mkdir -p \
+	/defaults \
+	/tmp/domoticz \
+	/usr/share/domoticz && \
+ curl -o /tmp/domoticz.tgz -L \
+		https://releases.domoticz.com/releases/release/domoticz_linux_x86_64.tgz && \
+ tar xf /tmp/domoticz.tgz -C \
+	/tmp/domoticz/ && \
+ mv /tmp/domoticz/domoticz /usr/bin/ && \
+ mv /tmp/domoticz/www /usr/share/domoticz/ && \
+ mv /tmp/domoticz/Config /usr/share/domoticz/ && \
+ mv /tmp/domoticz/scripts /defaults/ && \
+ mv /tmp/domoticz/dzVents /usr/share/domoticz/ && \
+ rm -rf /usr/share/domoticz/scripts/update_domoticz && \
+ rm -rf /usr/share/domoticz/scripts/restart_domoticz && \
+ rm -rf /usr/share/domoticz/scripts/download_update.sh && \
+ echo "**** add abc to dialout group ****" && \
+ usermod -a -G dialout abc && \
  echo " **** cleanup ****" && \
- apk del --purge \
-	build-dependencies && \
+ apt-get clean && \
  rm -rf \
 	/tmp/* \
-	/usr/lib/libftdi* \
-	/usr/include/ftdi.h
+	/var/lib/apt/lists/* \
+	/var/tmp/*
 
 # copy local files
-COPY root/ /
-
-# ports and volumes
-EXPOSE 8080 6144 1443
-VOLUME /config
+COPY root/ /