Bump alpine to 3.5 including fixes for telldus-core to compile

Author: tobbenb

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine
+FROM lsiobase/alpine:3.5
 MAINTAINER saarg
 
 # set version label
@@ -20,18 +20,21 @@ RUN \
 	boost-dev \
 	cmake \
 	curl-dev \
+	doxygen \
 	eudev-dev \
 	g++ \
 	gcc \
 	git \
 	libcurl \
+	libftdi1-dev \
 	libusb-compat-dev \
 	libusb-dev \
 	linux-headers \
 	lua5.2-dev \
 	make \
 	mosquitto-dev \
-	openssl-dev \
+	musl-dev \
+	libressl-dev \
 	pkgconf \
 	sqlite-dev \
 	tar \
@@ -45,13 +48,6 @@ RUN \
 	curl \
 	gzip && \
 
-# install telldus-core build-dependencies from edge
- apk add --no-cache --virtual=telldus-build-dependencies-edge \
-		--repository http://nl.alpinelinux.org/alpine/edge/community \
-	doxygen \
-	libftdi1-dev && \
-
-
 # add runtime packages required in build stage
  apk add --no-cache \
 	python3-dev && \
@@ -72,6 +68,7 @@ RUN \
 		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 && \
@@ -97,7 +94,7 @@ RUN \
 # build domoticz
  git clone https://github.com/domoticz/domoticz.git /tmp/domoticz && \
  cd /tmp/domoticz && \
-cmake \
+ cmake \
 	-DBUILD_SHARED_LIBS=True \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DCMAKE_INSTALL_PREFIX=/var/lib/domoticz \
@@ -128,8 +125,7 @@ cmake \
 # cleanup build dependencies
  apk del --purge \
 	build-dependencies \
-	telldus-build-dependencies \
-	telldus-build-dependencies-edge && \
+	telldus-build-dependencies && \
 
 
 # add abc to dialout and cron group trying to fix different GID for dialout group

patches/tmp/patches/CMakeLists.txt

@@ -0,0 +1,76 @@
+PROJECT( telldus-core )
+
+CMAKE_MINIMUM_REQUIRED( VERSION 2.6.0 )
+SET(CMAKE_CXX_STANDARD 98)
+
+CMAKE_POLICY(SET CMP0003 NEW)
+
+SET(PACKAGE_MAJOR_VERSION 2)
+SET(PACKAGE_MINOR_VERSION 1)
+SET(PACKAGE_PATCH_VERSION 2)
+SET(PACKAGE_VERSION "${PACKAGE_MAJOR_VERSION}.${PACKAGE_MINOR_VERSION}.${PACKAGE_PATCH_VERSION}")
+SET(PACKAGE_SUBVERSION "")
+SET(PACKAGE_SOVERSION 2)
+
+SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
+IF (PACKAGE_SUBVERSION)
+	SET(DISPLAYED_VERSION "${PACKAGE_VERSION}_${PACKAGE_SUBVERSION}")
+ELSE (PACKAGE_SUBVERSION)
+	SET(DISPLAYED_VERSION ${PACKAGE_VERSION})
+ENDIF(PACKAGE_SUBVERSION)
+
+SET(BUILD_LIBTELLDUS-CORE	TRUE	CACHE BOOL "Build libtelldus-core")
+
+IF (WIN32)
+	SET(TDADMIN_DEFAULT FALSE)
+ELSEIF(APPLE)
+	SET(TDADMIN_DEFAULT FALSE)
+ELSE (WIN32)
+	SET(TDADMIN_DEFAULT TRUE)
+ENDIF (WIN32)
+
+IF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+	INCLUDE_DIRECTORIES(/usr/local/include)
+	LINK_DIRECTORIES(/usr/local/lib)
+ENDIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+
+SET(BUILD_TDTOOL	TRUE				CACHE BOOL "Build tdtool")
+SET(BUILD_TDADMIN	${TDADMIN_DEFAULT}	CACHE BOOL "Build tdadmin")
+
+SET(GENERATE_MAN	FALSE	CACHE	BOOL "Enable generation of man-files")
+
+ADD_SUBDIRECTORY(common)
+ADD_SUBDIRECTORY(service)
+ADD_SUBDIRECTORY(client)
+
+IF(BUILD_TDTOOL)
+	IF(WIN32)
+		ADD_SUBDIRECTORY(3rdparty/openbsd-getopt)
+	ENDIF()
+	ADD_SUBDIRECTORY(tdtool)
+ENDIF(BUILD_TDTOOL)
+IF(BUILD_TDADMIN)
+	ADD_SUBDIRECTORY(tdadmin)
+ENDIF(BUILD_TDADMIN)
+
+ENABLE_TESTING()
+ADD_SUBDIRECTORY(tests)
+
+FIND_PACKAGE(Doxygen)
+
+IF(DOXYGEN_FOUND)
+	SET(DOXY_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+
+	CONFIGURE_FILE(
+		"${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in"
+		${DOXY_CONFIG} @ONLY
+	)
+
+	ADD_CUSTOM_TARGET(docs
+		${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG}
+		DEPENDS ${DOXY_CONFIG}
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+		COMMENT "Generating doxygen documentation" VERBATIM
+	)
+ENDIF()