Skip to content
This repository was archived by the owner on Jan 1, 2024. It is now read-only.

Commit 6fc1451

Browse files
committed
bump to alpine 3.7 and fix continuation lines
1 parent 639803b commit 6fc1451

File tree

2 files changed

+15
-27
lines changed

2 files changed

+15
-27
lines changed

Dockerfile

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
FROM lsiobase/alpine:3.6
2-
MAINTAINER saarg
1+
FROM lsiobase/alpine:3.7
32

43
# set version label
54
ARG BUILD_DATE
65
ARG VERSION
76
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
7+
LABEL maintainer="saarg"
88

9-
# Environment settings
9+
# environment settings
1010
ENV HOME="/config"
1111

1212
# copy prebuilds
1313
COPY patches/ /
1414

15-
# install build dependencies
1615
RUN \
16+
echo "**** install build packages ****" && \
1717
apk add --no-cache --virtual=build-dependencies \
1818
argp-standalone \
1919
autoconf \
@@ -43,21 +43,17 @@ RUN \
4343
sqlite-dev \
4444
tar \
4545
zlib-dev && \
46-
47-
# install runtime packages
46+
echo "**** install runtime packages ****" && \
4847
apk add --no-cache \
4948
curl \
5049
eudev-libs \
5150
libressl \
5251
python3-dev && \
53-
54-
# link libftdi as the alpine guys named the libs wrong
52+
echo "**** link libftdi libs ****" && \
5553
ln -s /usr/lib/libftdi1.so /usr/lib/libftdi.so && \
5654
ln -s /usr/lib/libftdi1.a /usr/lib/libftdi.a && \
5755
ln -s /usr/include/libftdi1/ftdi.h /usr/include/ftdi.h && \
58-
59-
60-
# build telldus-core
56+
echo "**** build telldus-core ****" && \
6157
mkdir -p \
6258
/tmp/telldus-core && \
6359
curl -o /tmp/telldus-core.tar.gz -L \
@@ -72,14 +68,12 @@ RUN \
7268
cd /tmp/telldus-core && \
7369
cmake -DBUILD_TDADMIN=false -DCMAKE_INSTALL_PREFIX=/tmp/telldus-core . && \
7470
make && \
75-
76-
# move needed telldus core files and link them
71+
echo "**** configure telldus core ****" && \
7772
mv /tmp/telldus-core/client/libtelldus-core.so.2.1.2 /usr/lib/libtelldus-core.so.2.1.2 && \
7873
mv /tmp/telldus-core/client/telldus-core.h /usr/include/telldus-core.h && \
7974
ln -s /usr/lib/libtelldus-core.so.2.1.2 /usr/lib/libtelldus-core.so.2 && \
8075
ln -s /usr/lib/libtelldus-core.so.2 /usr/lib/libtelldus-core.so && \
81-
82-
# build OpenZWave
76+
echo "**** build openzwave ****" && \
8377
git clone https://github.com/OpenZWave/open-zwave.git /tmp/open-zwave && \
8478
ln -s /tmp/open-zwave /tmp/open-zwave-read-only && \
8579
cd /tmp/open-zwave && \
@@ -90,8 +84,7 @@ RUN \
9084
PREFIX=/usr \
9185
sysconfdir=etc/openzwave \
9286
install && \
93-
94-
# build domoticz
87+
echo "**** build domoticz ****" && \
9588
git clone https://github.com/domoticz/domoticz.git /tmp/domoticz && \
9689
cd /tmp/domoticz && \
9790
cmake \
@@ -105,7 +98,7 @@ RUN \
10598
-DUSE_STATIC_LIBSTDCXX=OFF \
10699
-DUSE_STATIC_OPENZWAVE=OFF \
107100
-Wno-dev && \
108-
# attempt to set number of cores available for make to use
101+
echo "**** attempt to set number of cores available for make to use ****" && \
109102
set -ex && \
110103
CPU_CORES=$( < /proc/cpuinfo grep -c processor ) || echo "failed cpu look up" && \
111104
if echo $CPU_CORES | grep -E -q '^[0-9]+$'; then \
@@ -117,28 +110,22 @@ RUN \
117110
elif [ "$CPU_CORES" -gt 3 ]; then \
118111
CPU_CORES=$(( CPU_CORES - 1 )); fi \
119112
else CPU_CORES="1"; fi && \
120-
121113
make -j $CPU_CORES && \
122114
make install && \
123115
set +ex && \
124-
125-
# determine runtime packages
116+
echo "**** determine runtime packages using scanelf ****" && \
126117
RUNTIME_PACKAGES="$( \
127118
scanelf --needed --nobanner /var/lib/domoticz/domoticz \
128119
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
129120
| sort -u \
130121
| xargs -r apk info --installed \
131122
| sort -u \
132123
)" && \
133-
134-
# install runtime packages
135124
apk add --no-cache \
136125
$RUNTIME_PACKAGES && \
137-
138-
# add abc to dialout and cron group trying to fix different GID for dialout group
126+
echo "**** add abc to dialout and cron group ****" && \
139127
usermod -a -G 16,20 abc && \
140-
141-
# cleanup
128+
echo " **** cleanup ****" && \
142129
apk del --purge \
143130
build-dependencies && \
144131
rm -rf \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ The user manual is available at [www.domoticz.com][appurl]
107107

108108
## Versions
109109

110+
+ **08.12.2017:** Rebase to alpine 3.7.
110111
+ **26.11.2017:** Use cpu core counting routine to speed up build time.
111112
+ **28.05.2017:** Rebase to alpine 3.6.
112113
+ **26.02.2017:** Add curl and replace openssl with libressl.

0 commit comments

Comments
 (0)