Merge pull request #11 from linuxserver/stable-3.5877_alpine3.6

bump to alpine 3.6

Author: aptalca

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:3.5
+FROM lsiobase/alpine:3.6
 MAINTAINER saarg
 
 # package version
@@ -12,22 +12,26 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 # Environment settings
 ENV HOME="/config"
 
-# copy prebuilds
+# copy prebuilds
 COPY patches/ /
 
 # install build dependencies
 RUN \
  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 \
@@ -39,23 +43,18 @@ RUN \
 	mosquitto-dev \
 	musl-dev \
 	openzwave-dev \
-	python3-dev \
 	pkgconf \
 	sqlite-dev \
 	tar \
 	zlib-dev && \
 
-# install telldus-core build-dependencies
- apk add --no-cache --virtual=telldus-build-dependencies \
-	argp-standalone \
-	binutils \
-	confuse-dev \
-	curl \
-	gzip && \
-
-# add runtime packages required in build stage
+# install runtime packages
  apk add --no-cache \
-	openzwave && \
+	curl \
+	eudev-libs \
+	libressl \
+	openzwave \
+	python3-dev && \
 
 # link libftdi as the alpine guys named the libs wrong
  ln -s /usr/lib/libftdi1.so /usr/lib/libftdi.so && \
@@ -66,11 +65,11 @@ RUN \
  mkdir -p \
 	/tmp/telldus-core && \
  curl -o /tmp/telldus-core.tar.gz -L \
-		http://download.telldus.se/TellStick/Software/telldus-core/telldus-core-2.1.2.tar.gz && \
+	http://download.telldus.se/TellStick/Software/telldus-core/telldus-core-2.1.2.tar.gz && \
  tar xf /tmp/telldus-core.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 && \
+	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 && \
@@ -85,9 +84,8 @@ RUN \
  ln -s /usr/lib/libtelldus-core.so.2 /usr/lib/libtelldus-core.so && \
 
 # build domoticz
- git clone https://github.com/domoticz/domoticz.git /tmp/domoticz && \
+ git clone -b "${DOMOTICZ_VER}" https://github.com/domoticz/domoticz.git /tmp/domoticz && \
  cd /tmp/domoticz && \
- git checkout "${DOMOTICZ_VER}" && \
  cmake \
 	-DBUILD_SHARED_LIBS=True \
 	-DCMAKE_BUILD_TYPE=Release \
@@ -97,7 +95,8 @@ RUN \
 	-DUSE_BUILTIN_MQTT=OFF \
 	-DUSE_BUILTIN_SQLITE=OFF \
 	-DUSE_STATIC_LIBSTDCXX=OFF \
-	-DUSE_STATIC_OPENZWAVE=OFF && \
+	-DUSE_STATIC_OPENZWAVE=OFF \
+	-Wno-dev && \
  make && \
  make install && \
 
@@ -110,29 +109,22 @@ RUN \
 	| sort -u \
 	)" && \
 
-# install runtime dependencies
+# install runtime packages
  apk add --no-cache \
-	curl \
-	eudev-libs \
-	libressl \
-	python3 \
 	$RUNTIME_PACKAGES && \
 
-# cleanup build dependencies
- apk del --purge \
-	build-dependencies \
-	telldus-build-dependencies && \
-
 # add abc to dialout and cron group trying to fix different GID for dialout group
  usermod -a -G 16,20 abc && \
 
-# cleanup /tmp
+# cleanup
+ apk del --purge \
+	build-dependencies && \
  rm -rf \
 	/tmp/* \
 	/usr/lib/libftdi* \
 	/usr/include/ftdi.h
 
-# copy local files
+# copy local files
 COPY root/ /
 
 # ports and volumes