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

Commit 8991130

Browse files
authored
Merge pull request #15 from linuxserver/stable-3.8153_3.7
bump to alpine 3.7 and fix continuation lines
2 parents cbf7d1f + 60ebc6e commit 8991130

File tree

1 file changed

+16
-27
lines changed

1 file changed

+16
-27
lines changed

Dockerfile

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
FROM lsiobase/alpine:3.6
2-
MAINTAINER saarg
3-
4-
# package version
5-
ARG DOMOTICZ_VER="3.8153"
1+
FROM lsiobase/alpine:3.7
62

73
# set version label
84
ARG BUILD_DATE
95
ARG VERSION
106
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
7+
LABEL maintainer="saarg"
8+
9+
# package version
10+
ARG DOMOTICZ_VER="3.8153"
1111

12-
# Environment settings
12+
# environment settings
1313
ENV HOME="/config"
1414

1515
# copy prebuilds
1616
COPY patches/ /
1717

18-
# install build dependencies
1918
RUN \
19+
echo "**** install build packages ****" && \
2020
apk add --no-cache --virtual=build-dependencies \
2121
argp-standalone \
2222
autoconf \
@@ -47,21 +47,18 @@ RUN \
4747
sqlite-dev \
4848
tar \
4949
zlib-dev && \
50-
51-
# install runtime packages
50+
echo "**** install runtime packages ****" && \
5251
apk add --no-cache \
5352
curl \
5453
eudev-libs \
5554
libressl \
5655
openzwave \
5756
python3-dev && \
58-
59-
# link libftdi as the alpine guys named the libs wrong
57+
echo "**** link libftdi libs ****" && \
6058
ln -s /usr/lib/libftdi1.so /usr/lib/libftdi.so && \
6159
ln -s /usr/lib/libftdi1.a /usr/lib/libftdi.a && \
6260
ln -s /usr/include/libftdi1/ftdi.h /usr/include/ftdi.h && \
63-
64-
# build telldus-core
61+
echo "**** build telldus-core ****" && \
6562
mkdir -p \
6663
/tmp/telldus-core && \
6764
curl -o /tmp/telldus-core.tar.gz -L \
@@ -76,14 +73,12 @@ RUN \
7673
cd /tmp/telldus-core && \
7774
cmake -DBUILD_TDADMIN=false -DCMAKE_INSTALL_PREFIX=/tmp/telldus-core . && \
7875
make && \
79-
80-
# move needed telldus core files and link them
76+
echo "**** configure telldus core ****" && \
8177
mv /tmp/telldus-core/client/libtelldus-core.so.2.1.2 /usr/lib/libtelldus-core.so.2.1.2 && \
8278
mv /tmp/telldus-core/client/telldus-core.h /usr/include/telldus-core.h && \
8379
ln -s /usr/lib/libtelldus-core.so.2.1.2 /usr/lib/libtelldus-core.so.2 && \
8480
ln -s /usr/lib/libtelldus-core.so.2 /usr/lib/libtelldus-core.so && \
85-
86-
# build domoticz
81+
echo "**** build domoticz ****" && \
8782
git clone -b "${DOMOTICZ_VER}" https://github.com/domoticz/domoticz.git /tmp/domoticz && \
8883
cd /tmp/domoticz && \
8984
cmake \
@@ -97,7 +92,7 @@ RUN \
9792
-DUSE_STATIC_LIBSTDCXX=OFF \
9893
-DUSE_STATIC_OPENZWAVE=OFF \
9994
-Wno-dev && \
100-
# attempt to set number of cores available for make to use
95+
echo "**** attempt to set number of cores available for make to use ****" && \
10196
set -ex && \
10297
CPU_CORES=$( < /proc/cpuinfo grep -c processor ) || echo "failed cpu look up" && \
10398
if echo $CPU_CORES | grep -E -q '^[0-9]+$'; then \
@@ -109,28 +104,22 @@ RUN \
109104
elif [ "$CPU_CORES" -gt 3 ]; then \
110105
CPU_CORES=$(( CPU_CORES - 1 )); fi \
111106
else CPU_CORES="1"; fi && \
112-
113107
make -j $CPU_CORES && \
114108
make install && \
115109
set +ex && \
116-
117-
# determine runtime packages
110+
echo "**** determine runtime packages using scanelf ****" && \
118111
RUNTIME_PACKAGES="$( \
119112
scanelf --needed --nobanner /var/lib/domoticz/domoticz \
120113
| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
121114
| sort -u \
122115
| xargs -r apk info --installed \
123116
| sort -u \
124117
)" && \
125-
126-
# install runtime packages
127118
apk add --no-cache \
128119
$RUNTIME_PACKAGES && \
129-
130-
# add abc to dialout and cron group trying to fix different GID for dialout group
120+
echo "**** add abc to dialout and cron group ****" && \
131121
usermod -a -G 16,20 abc && \
132-
133-
# cleanup
122+
echo " **** cleanup ****" && \
134123
apk del --purge \
135124
build-dependencies && \
136125
rm -rf \

0 commit comments

Comments
 (0)