fping is already in alpine apk.
Chris committed
Feb 25, 2018 at 01:05 UTC
45bebffd74cee9fe81dd6b51c3ef3ebbe454cb05
1 file changed
+5
-7
Dockerfile.alpine
+5
-7
@@ -13,17 +13,14 @@ WORKDIR /opt/netdata.git
13
# Install source
14
RUN chmod +x ./netdata-installer.sh && \
15
sync && sleep 1 && \
16
- ./netdata-installer.sh --dont-wait --dont-start-it && \
17
- sync && sleep 1 && \
18
-# Compile fping
19
- /usr/libexec/netdata/plugins.d/fping.plugin install
16
+ ./netdata-installer.sh --dont-wait --dont-start-it
17
18
################################################################################
19
FROM alpine:edge
20
21
# Reinstall some prerequisites
22
RUN apk --no-cache add lm_sensors nodejs libuuid python py-mysqldb \
26
- py-psycopg2 py-yaml netcat-openbsd jq curl
23
+ py-psycopg2 py-yaml netcat-openbsd jq curl fping
24
25
# Copy files over
26
COPY --from=builder /usr/share/netdata /usr/share/netdata
@@ -32,12 +29,14 @@ COPY --from=builder /var/cache/netdata /var/cache/netdata
29
COPY --from=builder /var/lib/netdata /var/lib/netdata
30
COPY --from=builder /usr/sbin/netdata /usr/sbin/netdata
31
COPY --from=builder /etc/netdata /etc/netdata
35
-COPY --from=builder /usr/local/bin/fping /usr/local/bin/fping
32
33
ARG NETDATA_UID=101
34
ARG NETDATA_GID=101
35
36
RUN \
37
+ # fping from alpine apk is on a different location. Moving it.
38
+ mv /usr/sbin/fping /usr/local/bin/fping && \
39
+ chmod 4755 /usr/local/bin/fping && \
40
mkdir -p /var/log/netdata && \
41
# Add netdata user
42
addgroup -g ${NETDATA_GID} -S netdata && \
@@ -48,7 +47,6 @@ RUN \
47
chown -R netdata:netdata /var/cache/netdata /var/lib/netdata /usr/share/netdata && \
48
chown root:netdata /usr/libexec/netdata/plugins.d/apps.plugin /usr/libexec/netdata/plugins.d/cgroup-network && \
49
chmod 4750 /usr/libexec/netdata/plugins.d/cgroup-network /usr/libexec/netdata/plugins.d/apps.plugin && \
51
- chmod 4755 /usr/local/bin/fping && \
50
chmod 0750 /var/lib/netdata /var/cache/netdata && \
51
# Link log files to stdout
52
ln -sf /dev/stdout /var/log/netdata/access.log && \