Skip to content

Commit 2e5cc8a

Browse files
committed
Updated Dockerfile
1 parent 47da260 commit 2e5cc8a

File tree

4 files changed

+36
-26
lines changed

4 files changed

+36
-26
lines changed

Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:jessie
1+
FROM debian:stretch
22

33
ADD git-tag /git-tag
44

@@ -10,7 +10,9 @@ RUN apt update && apt full-upgrade -y && chmod +x /run.sh /build.sh && sync && s
1010

1111
WORKDIR /
1212

13-
ENV NETDATA_PORT=19999 SSMTP_TLS=YES SSMTP_SERVER=smtp.gmail.com SSMTP_PORT=587 SSMTP_HOSTNAME=localhost
13+
ENV NETDATA_PORT=19999 SMTP_TLS=on SMTP_STARTTLS=on SMTP_SERVER=smtp.gmail.com SMTP_PORT=587 SMTP_FROM=localhost
1414
EXPOSE $NETDATA_PORT
1515

16+
VOLUME /etc/netdata/override
17+
1618
ENTRYPOINT ["/run.sh"]

build_and_push.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ docker buildx create --name mybuilder
2323
docker buildx use mybuilder
2424

2525
# REMOVED linux/arm64 as debie:jessie isn't built for linux/arm64
26-
docker buildx build --platform linux/amd64,linux/arm -t $MY_IMAGE_NAME:latest -t $MY_IMAGE_NAME:$NETDATA_VERSION --push .
26+
docker buildx build --platform linux/amd64,linux/arm,linux/arm64 -t $MY_IMAGE_NAME:latest -t $MY_IMAGE_NAME:$NETDATA_VERSION --push .

scripts/build.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ DEBIAN_FRONTEND=noninteractive
44

55
# some mirrors have issues, i skipped httpredir in favor of an eu mirror
66

7-
echo "deb http://ftp.nl.debian.org/debian/ jessie main" > /etc/apt/sources.list
8-
echo "deb http://security.debian.org/debian-security jessie/updates main" >> /etc/apt/sources.list
7+
echo "deb http://ftp.nl.debian.org/debian/ stretch main" > /etc/apt/sources.list
8+
echo "deb http://security.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list
99

1010
# install dependencies for build
1111

1212
apt-get -qq update
13-
apt-get -y install zlib1g-dev uuid-dev libmnl-dev gcc make curl git autoconf autogen automake pkg-config netcat-openbsd jq
14-
apt-get -y install autoconf-archive lm-sensors nodejs python python-mysqldb python-yaml
15-
apt-get -y install ssmtp mailutils apcupsd
13+
apt-get -y install zlib1g-dev uuid-dev libmnl-dev gcc make curl git autoconf autogen automake pkg-config netcat-openbsd jq libuv1-dev liblz4-dev libjudy-dev libssl-dev
14+
apt-get -y install autoconf-archive lm-sensors nodejs python python-mysqldb python-yaml libjudydebian1 libuv1 liblz4-1 openssl
15+
apt-get -y install msmtp msmtp-mta apcupsd fping
1616

1717
# fetch netdata
1818

@@ -39,7 +39,7 @@ fi
3939
cd /
4040
rm -rf /netdata.git
4141

42-
dpkg -P zlib1g-dev uuid-dev libmnl-dev gcc make git autoconf autogen automake pkg-config
42+
dpkg -P zlib1g-dev uuid-dev libmnl-dev gcc make git autoconf autogen automake pkg-config libuv1-dev liblz4-dev libjudy-dev libssl-dev
4343
apt-get -y autoremove
4444
apt-get clean
4545
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

scripts/run.sh

+25-17
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,41 @@
44
chown root:root /usr/share/netdata/web/ -R
55
echo -n "" > /usr/share/netdata/web/version.txt
66

7-
# set up ssmtp
8-
if [[ $SSMTP_TO ]]; then
9-
cat << EOF > /etc/ssmtp/ssmtp.conf
10-
root=$SSMTP_TO
11-
mailhub=$SSMTP_SERVER:$SSMTP_PORT
12-
UseSTARTTLS=$SSMTP_TLS
13-
hostname=$SSMTP_HOSTNAME
14-
FromLineOverride=NO
7+
# set up msmtp
8+
if [[ $SMTP_TO ]]; then
9+
cat << EOF > /etc/msmtprc
10+
account default
11+
aliases /etc/msmtp_aliases
12+
from $SMTP_FROM
13+
host $SMTP_SERVER
14+
port $SMTP_PORT
15+
tls $SMTP_TLS
16+
tls_starttls $SMTP_STARTTLS
17+
tls_certcheck off
1518
EOF
1619

17-
cat << EOF > /etc/ssmtp/revaliases
18-
netdata:netdata@$SSMTP_HOSTNAME:$SSMTP_SERVER:$SSMTP_PORT
19-
root:netdata@$SSMTP_HOSTNAME:$SSMTP_SERVER:$SSMTP_PORT
20+
cat << EOF > /etc/msmtp_aliases
21+
netdata: $SMTP_TO
22+
root: $SMTP_TO
2023
EOF
2124
fi
2225

23-
if [[ $SSMTP_USER ]]; then
24-
cat << EOF >> /etc/ssmtp/ssmtp.conf
25-
AuthUser=$SSMTP_USER
26+
if [[ $SMTP_USER ]]; then
27+
cat << EOF >> /etc/msmtprc
28+
auth on
29+
user $SMTP_USER
2630
EOF
2731
fi
2832

29-
if [[ $SSMTP_PASS ]]; then
30-
cat << EOF >> /etc/ssmtp/ssmtp.conf
31-
AuthPass=$SSMTP_PASS
33+
if [[ $SMTP_PASS ]]; then
34+
cat << EOF >> /etc/msmtprc
35+
password $SMTP_PASS
3236
EOF
3337
fi
3438

39+
# copy conf from NETDATA_STOCK_CONFIG_DIR (normally under /usr/lib/netdata/conf.d) to NETDATA_USER_CONFIG_DIR (normally under /etc/netdata)
40+
cp /usr/lib/netdata/conf.d/health_alarm_notify.conf /etc/netdata
41+
3542
if [[ $SLACK_WEBHOOK_URL ]]; then
3643
sed -i -e "s@SLACK_WEBHOOK_URL=\"\"@SLACK_WEBHOOK_URL=\"${SLACK_WEBHOOK_URL}\"@" /etc/netdata/health_alarm_notify.conf
3744
fi
@@ -107,4 +114,5 @@ for f in /etc/netdata/override/*; do
107114
done
108115

109116
# main entrypoint
117+
touch /etc/netdata/python.d.conf
110118
exec /usr/sbin/netdata -D -u root -s /host -p ${NETDATA_PORT} ${NETDATA_ARGS} "$@"

0 commit comments

Comments
 (0)