Skip to content

Commit 45bebff

Browse files
committed
fping is already in alpine apk.
1 parent a5e52b4 commit 45bebff

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

Dockerfile.alpine

+5-7
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,14 @@ WORKDIR /opt/netdata.git
1313
# Install source
1414
RUN chmod +x ./netdata-installer.sh && \
1515
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
2017

2118
################################################################################
2219
FROM alpine:edge
2320

2421
# Reinstall some prerequisites
2522
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
2724

2825
# Copy files over
2926
COPY --from=builder /usr/share/netdata /usr/share/netdata
@@ -32,12 +29,14 @@ COPY --from=builder /var/cache/netdata /var/cache/netdata
3229
COPY --from=builder /var/lib/netdata /var/lib/netdata
3330
COPY --from=builder /usr/sbin/netdata /usr/sbin/netdata
3431
COPY --from=builder /etc/netdata /etc/netdata
35-
COPY --from=builder /usr/local/bin/fping /usr/local/bin/fping
3632

3733
ARG NETDATA_UID=101
3834
ARG NETDATA_GID=101
3935

4036
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 && \
4140
mkdir -p /var/log/netdata && \
4241
# Add netdata user
4342
addgroup -g ${NETDATA_GID} -S netdata && \
@@ -48,7 +47,6 @@ RUN \
4847
chown -R netdata:netdata /var/cache/netdata /var/lib/netdata /usr/share/netdata && \
4948
chown root:netdata /usr/libexec/netdata/plugins.d/apps.plugin /usr/libexec/netdata/plugins.d/cgroup-network && \
5049
chmod 4750 /usr/libexec/netdata/plugins.d/cgroup-network /usr/libexec/netdata/plugins.d/apps.plugin && \
51-
chmod 4755 /usr/local/bin/fping && \
5250
chmod 0750 /var/lib/netdata /var/cache/netdata && \
5351
# Link log files to stdout
5452
ln -sf /dev/stdout /var/log/netdata/access.log && \

0 commit comments

Comments
 (0)