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

Commit aa10e7a

Browse files
thespadthespad
authored
Merge pull request #106 from linuxserver/s6v3
2 parents e42dff3 + aea4cd7 commit aa10e7a

File tree

21 files changed

+196
-496
lines changed

21 files changed

+196
-496
lines changed

‎Dockerfile

Lines changed: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM ghcr.io/linuxserver/baseimage-ubuntu:focal-da661a62-ls106
1+
# syntax=docker/dockerfile:1
2+
3+
FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
24

35
# set version label
46
ARG BUILD_DATE
@@ -13,58 +15,59 @@ ENV HOME="/config"
1315

1416

1517
RUN \
16-
echo "**** install runtime packages ****" && \
17-
apt-get update && \
18-
apt-get install -y --no-install-recommends \
19-
curl \
20-
cron \
21-
libc6 \
22-
libcap2-bin \
23-
libcurl3-gnutls \
24-
libcurl4 \
25-
libpython3.8 \
26-
libudev-dev \
27-
libusb-0.1-4 \
28-
mosquitto-clients \
29-
python3-pip \
30-
python3-requests \
31-
unzip \
32-
wget \
33-
zlib1g && \
34-
echo "**** link to python lib so domoticz finds it ****" && \
35-
ln -s /usr/lib/x86_64-linux-gnu/libpython3.8.so.1.0 /usr/lib/x86_64-linux-gnu/libpython3.8.so && \
36-
echo "**** install domoticz ****" && \
37-
if [ -z ${DOMOTICZ_RELEASE+x} ]; then \
38-
DOMOTICZ_RELEASE=$(curl -sX GET "https://api.github.com/repos/domoticz/domoticz/releases/latest" \
39-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
40-
fi && \
41-
mkdir -p \
42-
/defaults \
43-
/tmp/domoticz \
44-
/usr/share/domoticz && \
45-
curl -o /tmp/domoticz.tgz -L \
46-
https://releases.domoticz.com/releases/release/domoticz_linux_x86_64.tgz && \
47-
tar xf /tmp/domoticz.tgz -C \
48-
/tmp/domoticz/ && \
49-
mv /tmp/domoticz/domoticz /usr/bin/ && \
50-
mv /tmp/domoticz/www /usr/share/domoticz/ && \
51-
mv /tmp/domoticz/Config /usr/share/domoticz/ && \
52-
mv /tmp/domoticz/scripts /defaults/ && \
53-
mv /tmp/domoticz/dzVents /usr/share/domoticz/ && \
54-
rm -rf /usr/share/domoticz/scripts/update_domoticz && \
55-
rm -rf /usr/share/domoticz/scripts/restart_domoticz && \
56-
rm -rf /usr/share/domoticz/scripts/download_update.sh && \
57-
echo "**** add abc to dialout group ****" && \
58-
usermod -a -G dialout abc && \
59-
echo " **** cleanup ****" && \
60-
apt-get clean && \
61-
rm -rf \
62-
/tmp/* \
63-
/var/lib/apt/lists/* \
64-
/var/tmp/*
18+
echo "**** install runtime packages ****" && \
19+
apt-get update && \
20+
apt-get install -y --no-install-recommends \
21+
cron \
22+
libc6 \
23+
libcap2-bin \
24+
libcurl3-gnutls \
25+
libcurl4 \
26+
libpython3.8 \
27+
libudev-dev \
28+
libusb-0.1-4 \
29+
mosquitto-clients \
30+
python3-pip \
31+
python3-requests \
32+
unzip \
33+
wget \
34+
zlib1g && \
35+
echo "**** link to python lib so domoticz finds it ****" && \
36+
ln -s /usr/lib/x86_64-linux-gnu/libpython3.8.so.1.0 /usr/lib/x86_64-linux-gnu/libpython3.8.so && \
37+
echo "**** install domoticz ****" && \
38+
if [ -z ${DOMOTICZ_RELEASE+x} ]; then \
39+
DOMOTICZ_RELEASE=$(curl -sX GET "https://api.github.com/repos/domoticz/domoticz/releases/latest" \
40+
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
41+
fi && \
42+
mkdir -p \
43+
/defaults \
44+
/tmp/domoticz \
45+
/usr/share/domoticz && \
46+
curl -o /tmp/domoticz.tgz -L \
47+
https://releases.domoticz.com/releases/release/domoticz_linux_x86_64.tgz && \
48+
tar xf /tmp/domoticz.tgz -C \
49+
/tmp/domoticz/ && \
50+
mv /tmp/domoticz/domoticz /usr/bin/ && \
51+
mv /tmp/domoticz/www /usr/share/domoticz/ && \
52+
mv /tmp/domoticz/Config /usr/share/domoticz/ && \
53+
mv /tmp/domoticz/scripts /defaults/ && \
54+
mv /tmp/domoticz/dzVents /usr/share/domoticz/ && \
55+
rm -rf /usr/share/domoticz/scripts/update_domoticz && \
56+
rm -rf /usr/share/domoticz/scripts/restart_domoticz && \
57+
rm -rf /usr/share/domoticz/scripts/download_update.sh && \
58+
echo "**** add abc to dialout group ****" && \
59+
usermod -a -G dialout abc && \
60+
echo " **** cleanup ****" && \
61+
apt-get clean && \
62+
rm -rf \
63+
/tmp/* \
64+
/var/lib/apt/lists/* \
65+
/var/tmp/*
6566

6667
# copy local files
6768
COPY root/ /
6869

6970
# expose ports
7071
EXPOSE 1443 6144 8080
72+
73+
VOLUME /config

‎Dockerfile.aarch64

Lines changed: 53 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal-da661a62-ls106
1+
# syntax=docker/dockerfile:1
2+
3+
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
24

35
# set version label
46
ARG BUILD_DATE
@@ -13,57 +15,59 @@ ENV HOME="/config"
1315

1416

1517
RUN \
16-
echo "**** install runtime packages ****" && \
17-
apt-get update && \
18-
apt-get install -y --no-install-recommends \
19-
curl \
20-
cron \
21-
libc6 \
22-
libcap2-bin \
23-
libcurl3-gnutls \
24-
libcurl4 \
25-
libudev-dev \
26-
libusb-0.1-4 \
27-
mosquitto-clients \
28-
libpython3.8 \
29-
python3-pip \
30-
unzip \
31-
wget \
32-
zlib1g && \
33-
echo "**** link to python lib so domoticz finds it ****" && \
34-
ln -s /usr/lib/aarch64-linux-gnu/libpython3.8.so.1.0 /usr/lib/aarch64-linux-gnu/libpython3.8.so && \
35-
echo "**** install domoticz ****" && \
36-
if [ -z ${DOMOTICZ_RELEASE+x} ]; then \
37-
DOMOTICZ_RELEASE=$(curl -sX GET "https://api.github.com/repos/domoticz/domoticz/releases/latest" \
38-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
39-
fi && \
40-
mkdir -p \
41-
/defaults \
42-
/tmp/domoticz \
43-
/usr/share/domoticz && \
44-
curl -o /tmp/domoticz.tgz -L \
45-
https://releases.domoticz.com/releases/release/domoticz_linux_aarch64.tgz && \
46-
tar xf /tmp/domoticz.tgz -C \
47-
/tmp/domoticz/ && \
48-
mv /tmp/domoticz/domoticz /usr/bin/ && \
49-
mv /tmp/domoticz/www /usr/share/domoticz/ && \
50-
mv /tmp/domoticz/Config /usr/share/domoticz/ && \
51-
mv /tmp/domoticz/scripts /defaults/ && \
52-
mv /tmp/domoticz/dzVents /usr/share/domoticz/ && \
53-
rm -rf /usr/share/domoticz/scripts/update_domoticz && \
54-
rm -rf /usr/share/domoticz/scripts/restart_domoticz && \
55-
rm -rf /usr/share/domoticz/scripts/download_update.sh && \
56-
echo "**** add abc to dialout group ****" && \
57-
usermod -a -G dialout abc && \
58-
echo " **** cleanup ****" && \
59-
apt-get clean && \
60-
rm -rf \
61-
/tmp/* \
62-
/var/lib/apt/lists/* \
63-
/var/tmp/*
18+
echo "**** install runtime packages ****" && \
19+
apt-get update && \
20+
apt-get install -y --no-install-recommends \
21+
cron \
22+
libc6 \
23+
libcap2-bin \
24+
libcurl3-gnutls \
25+
libcurl4 \
26+
libpython3.8 \
27+
libudev-dev \
28+
libusb-0.1-4 \
29+
mosquitto-clients \
30+
python3-pip \
31+
python3-requests \
32+
unzip \
33+
wget \
34+
zlib1g && \
35+
echo "**** link to python lib so domoticz finds it ****" && \
36+
ln -s /usr/lib/aarch64-linux-gnu/libpython3.8.so.1.0 /usr/lib/aarch64-linux-gnu/libpython3.8.so && \
37+
echo "**** install domoticz ****" && \
38+
if [ -z ${DOMOTICZ_RELEASE+x} ]; then \
39+
DOMOTICZ_RELEASE=$(curl -sX GET "https://api.github.com/repos/domoticz/domoticz/releases/latest" \
40+
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
41+
fi && \
42+
mkdir -p \
43+
/defaults \
44+
/tmp/domoticz \
45+
/usr/share/domoticz && \
46+
curl -o /tmp/domoticz.tgz -L \
47+
https://releases.domoticz.com/releases/release/domoticz_linux_aarch64.tgz && \
48+
tar xf /tmp/domoticz.tgz -C \
49+
/tmp/domoticz/ && \
50+
mv /tmp/domoticz/domoticz /usr/bin/ && \
51+
mv /tmp/domoticz/www /usr/share/domoticz/ && \
52+
mv /tmp/domoticz/Config /usr/share/domoticz/ && \
53+
mv /tmp/domoticz/scripts /defaults/ && \
54+
mv /tmp/domoticz/dzVents /usr/share/domoticz/ && \
55+
rm -rf /usr/share/domoticz/scripts/update_domoticz && \
56+
rm -rf /usr/share/domoticz/scripts/restart_domoticz && \
57+
rm -rf /usr/share/domoticz/scripts/download_update.sh && \
58+
echo "**** add abc to dialout group ****" && \
59+
usermod -a -G dialout abc && \
60+
echo " **** cleanup ****" && \
61+
apt-get clean && \
62+
rm -rf \
63+
/tmp/* \
64+
/var/lib/apt/lists/* \
65+
/var/tmp/*
6466

6567
# copy local files
6668
COPY root/ /
6769

6870
# expose ports
6971
EXPOSE 1443 6144 8080
72+
73+
VOLUME /config

‎Dockerfile.armhf

Lines changed: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal-da661a62-ls106
1+
# syntax=docker/dockerfile:1
2+
3+
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
24

35
# set version label
46
ARG BUILD_DATE
@@ -13,58 +15,59 @@ ENV HOME="/config"
1315

1416

1517
RUN \
16-
echo "**** install runtime packages ****" && \
17-
apt-get update && \
18-
apt-get install -y --no-install-recommends \
19-
curl \
20-
cron \
21-
libc6 \
22-
libcap2-bin \
23-
libcurl3-gnutls \
24-
libcurl4 \
25-
libudev-dev \
26-
libusb-0.1-4 \
27-
mosquitto-clients \
28-
libpython3.8 \
29-
python3-pip \
30-
unzip \
31-
wget \
32-
zlib1g && \
33-
echo "**** link to python lib so domoticz finds it ****" && \
34-
ln -s /usr/lib/arm-linux-gnueabihf/libpython3.8.so.1.0 /usr/lib/arm-linux-gnueabihf/libpython3.8.so && \
35-
echo "**** install domoticz ****" && \
36-
if [ -z ${DOMOTICZ_RELEASE+x} ]; then \
37-
DOMOTICZ_RELEASE=$(curl -sX GET "https://api.github.com/repos/domoticz/domoticz/releases/latest" \
38-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
39-
fi && \
40-
mkdir -p \
41-
/defaults \
42-
/tmp/domoticz \
43-
/usr/share/domoticz && \
44-
curl -o /tmp/domoticz.tgz -L \
45-
https://releases.domoticz.com/releases/release/domoticz_linux_armv7l.tgz && \
46-
# https://releases.domoticz.com/releases/beta/domoticz_linux_armv7l.tgz && \
47-
tar xf /tmp/domoticz.tgz -C \
48-
/tmp/domoticz/ && \
49-
mv /tmp/domoticz/domoticz /usr/bin/ && \
50-
mv /tmp/domoticz/www /usr/share/domoticz/ && \
51-
mv /tmp/domoticz/Config /usr/share/domoticz/ && \
52-
mv /tmp/domoticz/scripts /defaults/ && \
53-
mv /tmp/domoticz/dzVents /usr/share/domoticz/ && \
54-
rm -rf /usr/share/domoticz/scripts/update_domoticz && \
55-
rm -rf /usr/share/domoticz/scripts/restart_domoticz && \
56-
rm -rf /usr/share/domoticz/scripts/download_update.sh && \
57-
echo "**** add abc to dialout group ****" && \
58-
usermod -a -G dialout abc && \
59-
echo " **** cleanup ****" && \
60-
apt-get clean && \
61-
rm -rf \
62-
/tmp/* \
63-
/var/lib/apt/lists/* \
64-
/var/tmp/*
18+
echo "**** install runtime packages ****" && \
19+
apt-get update && \
20+
apt-get install -y --no-install-recommends \
21+
cron \
22+
libc6 \
23+
libcap2-bin \
24+
libcurl3-gnutls \
25+
libcurl4 \
26+
libpython3.8 \
27+
libudev-dev \
28+
libusb-0.1-4 \
29+
mosquitto-clients \
30+
python3-pip \
31+
python3-requests \
32+
unzip \
33+
wget \
34+
zlib1g && \
35+
echo "**** link to python lib so domoticz finds it ****" && \
36+
ln -s /usr/lib/arm-linux-gnueabihf/libpython3.8.so.1.0 /usr/lib/arm-linux-gnueabihf/libpython3.8.so && \
37+
echo "**** install domoticz ****" && \
38+
if [ -z ${DOMOTICZ_RELEASE+x} ]; then \
39+
DOMOTICZ_RELEASE=$(curl -sX GET "https://api.github.com/repos/domoticz/domoticz/releases/latest" \
40+
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
41+
fi && \
42+
mkdir -p \
43+
/defaults \
44+
/tmp/domoticz \
45+
/usr/share/domoticz && \
46+
curl -o /tmp/domoticz.tgz -L \
47+
https://releases.domoticz.com/releases/release/domoticz_linux_armv7l.tgz && \
48+
tar xf /tmp/domoticz.tgz -C \
49+
/tmp/domoticz/ && \
50+
mv /tmp/domoticz/domoticz /usr/bin/ && \
51+
mv /tmp/domoticz/www /usr/share/domoticz/ && \
52+
mv /tmp/domoticz/Config /usr/share/domoticz/ && \
53+
mv /tmp/domoticz/scripts /defaults/ && \
54+
mv /tmp/domoticz/dzVents /usr/share/domoticz/ && \
55+
rm -rf /usr/share/domoticz/scripts/update_domoticz && \
56+
rm -rf /usr/share/domoticz/scripts/restart_domoticz && \
57+
rm -rf /usr/share/domoticz/scripts/download_update.sh && \
58+
echo "**** add abc to dialout group ****" && \
59+
usermod -a -G dialout abc && \
60+
echo " **** cleanup ****" && \
61+
apt-get clean && \
62+
rm -rf \
63+
/tmp/* \
64+
/var/lib/apt/lists/* \
65+
/var/tmp/*
6566

6667
# copy local files
6768
COPY root/ /
6869

6970
# expose ports
7071
EXPOSE 1443 6144 8080
72+
73+
VOLUME /config

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ services:
8383
- WEBROOT=domoticz #optional
8484
- "DBASE=<path to database>" #optional
8585
volumes:
86-
- <path to data>:/config
86+
- /path/to/data:/config
8787
ports:
8888
- 8080:8080
8989
- 6144:6144
@@ -106,7 +106,7 @@ docker run -d \
106106
-p 8080:8080 \
107107
-p 6144:6144 \
108108
-p 1443:1443 \
109-
-v <path to data>:/config \
109+
-v /path/to/data:/config \
110110
--device path to device:path to device \
111111
--restart unless-stopped \
112112
lscr.io/linuxserver/domoticz:latest
@@ -251,6 +251,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
251251

252252
## Versions
253253

254+
* **20.02.23:** - Migrate to s6v3.
254255
* **15.10.22:** - Remove deprecated legacy stable branches.
255256
* **05.02.22:** - Set default webroot to /. Add env. variable for setting custom databas path.
256257
* **26.12.20:** - Rebase to Ubuntu Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf.

0 commit comments

Comments
 (0)