diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2018-11-07 12:19:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2018-11-07 12:20:17 +0000 |
commit | a64a253794ac64cb40befee54db53bde17dd0d49 (patch) | |
tree | c1024acc5f6e508814b944d99f112259bb28b1be /Dockerfile | |
parent | New upstream version 1.10.0+dfsg (diff) | |
download | netdata-a64a253794ac64cb40befee54db53bde17dd0d49.tar.xz netdata-a64a253794ac64cb40befee54db53bde17dd0d49.zip |
New upstream version 1.11.0+dfsgupstream/1.11.0+dfsg
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | Dockerfile | 15 | ||||
-rw-r--r-- | Dockerfile.aarch64 | 19 | ||||
-rw-r--r-- | Dockerfile.alpine | 58 | ||||
-rw-r--r-- | Dockerfile.armv7hf | 19 |
4 files changed, 0 insertions, 111 deletions
diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index cb1f75cb9..000000000 --- a/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# author : titpetric -# original: https://github.com/titpetric/netdata - -FROM debian:stretch - -ADD . /netdata.git - -RUN cd ./netdata.git && chmod +x ./docker-build.sh && sync && sleep 1 && ./docker-build.sh - -WORKDIR / - -ENV NETDATA_PORT 19999 -EXPOSE $NETDATA_PORT - -CMD /usr/sbin/netdata -D -s /host -p ${NETDATA_PORT} diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 deleted file mode 100644 index 544269876..000000000 --- a/Dockerfile.aarch64 +++ /dev/null @@ -1,19 +0,0 @@ -# author : titpetric -# original: https://github.com/titpetric/netdata - -FROM resin/aarch64-debian:stretch - -RUN [ "cross-build-start"] - -ADD . /netdata.git - -RUN cd ./netdata.git && chmod +x ./docker-build.sh && sync && sleep 1 && ./docker-build.sh - -WORKDIR / - -ENV NETDATA_PORT 19999 -EXPOSE $NETDATA_PORT - -CMD /usr/sbin/netdata -D -s /host -p ${NETDATA_PORT} - -RUN [ "cross-build-end"] diff --git a/Dockerfile.alpine b/Dockerfile.alpine deleted file mode 100644 index bd958116c..000000000 --- a/Dockerfile.alpine +++ /dev/null @@ -1,58 +0,0 @@ -FROM alpine:edge as builder - -# Install prerequisites -RUN apk --no-cache add alpine-sdk autoconf automake libmnl-dev build-base jq \ - lm_sensors nodejs pkgconfig py-mysqldb python libuuid \ - py-psycopg2 py-yaml util-linux-dev zlib-dev curl bash \ - netcat-openbsd - -# Copy source -COPY . /opt/netdata.git -WORKDIR /opt/netdata.git - -# Install source -RUN chmod +x ./netdata-installer.sh && \ - sync && sleep 1 && \ - ./netdata-installer.sh --dont-wait --dont-start-it - -################################################################################ -FROM alpine:edge - -# Reinstall some prerequisites -RUN apk --no-cache add lm_sensors nodejs libuuid python py-mysqldb \ - py-psycopg2 py-yaml netcat-openbsd jq curl fping - -# Copy files over -COPY --from=builder /usr/share/netdata /usr/share/netdata -COPY --from=builder /usr/libexec/netdata /usr/libexec/netdata -COPY --from=builder /var/cache/netdata /var/cache/netdata -COPY --from=builder /var/lib/netdata /var/lib/netdata -COPY --from=builder /usr/sbin/netdata /usr/sbin/netdata -COPY --from=builder /etc/netdata /etc/netdata - -ARG NETDATA_UID=101 -ARG NETDATA_GID=101 - -RUN \ - # fping from alpine apk is on a different location. Moving it. - mv /usr/sbin/fping /usr/local/bin/fping && \ - chmod 4755 /usr/local/bin/fping && \ - mkdir -p /var/log/netdata && \ - # Add netdata user - addgroup -g ${NETDATA_GID} -S netdata && \ - adduser -S -H -s /bin/sh -u ${NETDATA_GID} -h /etc/netdata -G netdata netdata && \ - # Apply the permissions as described in - # https://github.com/firehol/netdata/wiki/netdata-security#netdata-directories - chown -R root:netdata /etc/netdata && \ - chown -R netdata:netdata /var/cache/netdata /var/lib/netdata /usr/share/netdata && \ - chown root:netdata /usr/libexec/netdata/plugins.d/apps.plugin /usr/libexec/netdata/plugins.d/cgroup-network && \ - chmod 4750 /usr/libexec/netdata/plugins.d/cgroup-network /usr/libexec/netdata/plugins.d/apps.plugin && \ - chmod 0750 /var/lib/netdata /var/cache/netdata && \ - # Link log files to stdout - ln -sf /dev/stdout /var/log/netdata/access.log && \ - ln -sf /dev/stdout /var/log/netdata/debug.log && \ - ln -sf /dev/stderr /var/log/netdata/error.log - -EXPOSE 19999 - -CMD [ "/usr/sbin/netdata" , "-D", "-s", "/host", "-p", "19999"] diff --git a/Dockerfile.armv7hf b/Dockerfile.armv7hf deleted file mode 100644 index 278e45424..000000000 --- a/Dockerfile.armv7hf +++ /dev/null @@ -1,19 +0,0 @@ -# author : titpetric -# original: https://github.com/titpetric/netdata - -FROM resin/armv7hf-debian:stretch - -RUN [ "cross-build-start"] - -ADD . /netdata.git - -RUN cd ./netdata.git && chmod +x ./docker-build.sh && sync && sleep 1 && ./docker-build.sh - -WORKDIR / - -ENV NETDATA_PORT 19999 -EXPOSE $NETDATA_PORT - -CMD /usr/sbin/netdata -D -s /host -p ${NETDATA_PORT} - -RUN [ "cross-build-end"] |