New upstream version 1.11.0+dfsgupstream/1.11.0+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 198 insertions, 36 deletions

diff --git a/docker-build.sh b/docker-build.sh
deleted file mode 100644
index fd056c390..000000000
--- a/docker-build.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# author  : titpetric
-# original: https://github.com/titpetric/netdata
-
-set -e
-DEBIAN_FRONTEND=noninteractive
-
-# some mirrors have issues, i skipped httpredir in favor of an eu mirror
-
-# install dependencies for build
-
-apt-get -qq update
-apt-get -y install zlib1g-dev uuid-dev libmnl-dev gcc make curl git autoconf autogen automake pkg-config netcat-openbsd jq
-apt-get -y install autoconf-archive lm-sensors nodejs python python-mysqldb python-yaml
-
-# use the provided installer
-
-./netdata-installer.sh --dont-wait --dont-start-it
-
-# remove build dependencies
-
-cd /
-rm -rf /netdata.git
-
-dpkg -P zlib1g-dev uuid-dev libmnl-dev gcc make git autoconf autogen automake pkg-config
-apt-get -y autoremove
-apt-get clean
-rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-
-# symlink access log and error log to stdout/stderr
-
-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
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 000000000..4362a273e
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,104 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+# author  : paulfantom
+
+# Cross-arch building is achieved by specifying ARCH as a build parameter with `--build-arg` option.
+# It is automated in `build.sh` script
+ARG ARCH=amd64-v3.8
+FROM multiarch/alpine:${ARCH} as builder
+
+# Install prerequisites
+RUN apk --no-cache add alpine-sdk \
+                       autoconf \
+                       automake \
+                       bash \
+                       build-base \
+                       curl \
+                       jq \
+                       libmnl-dev \
+                       libuuid \
+                       lm_sensors \
+                       netcat-openbsd \
+                       nodejs \
+                       pkgconfig \
+                       py-mysqldb \
+                       py-psycopg2 \
+                       py-yaml \
+                       python \
+                       util-linux-dev \
+                       zlib-dev
+
+# Copy source
+COPY . /opt/netdata.git
+WORKDIR /opt/netdata.git
+
+# Install from source
+RUN chmod +x netdata-installer.sh && \
+    sync && sleep 1 && \
+    ./netdata-installer.sh --dont-wait --dont-start-it
+
+# files to one directory
+RUN mkdir -p /app/usr/sbin/ \
+             /app/usr/share \
+             /app/usr/libexec \
+             /app/usr/lib \
+             /app/var/cache \
+             /app/var/lib \
+             /app/etc && \
+    mv /usr/share/netdata   /app/usr/share/ && \
+    mv /usr/libexec/netdata /app/usr/libexec/ && \
+    mv /usr/lib/netdata     /app/usr/lib/ && \
+    mv /var/cache/netdata   /app/var/cache/ && \
+    mv /var/lib/netdata     /app/var/lib/ && \
+    mv /etc/netdata         /app/etc/ && \
+    mv /usr/sbin/netdata    /app/usr/sbin/ && \
+    mv docker/run.sh        /app/usr/sbin/ && \
+    chmod +x /app/usr/sbin/run.sh
+
+#####################################################################
+ARG ARCH
+FROM multiarch/alpine:${ARCH}
+
+# Reinstall some prerequisites
+RUN apk --no-cache add curl \
+                       fping \
+                       jq \
+                       libuuid \
+                       lm_sensors \
+                       netcat-openbsd \
+                       nodejs \
+                       py-mysqldb \
+                       py-psycopg2 \
+                       py-yaml \
+                       python
+
+# Copy files over
+COPY --from=builder /app /
+
+# Configure system
+ARG NETDATA_UID=201
+ARG NETDATA_GID=201
+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 /usr/sbin/nologin -u ${NETDATA_GID} -h /etc/netdata -G netdata netdata && \
+    # Apply the permissions as described in
+    # https://github.com/netdata/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 -R root:netdata /usr/lib/netdata && \
+    chown -R 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
+
+ENV NETDATA_PORT 19999
+EXPOSE $NETDATA_PORT
+
+ENTRYPOINT ["/usr/sbin/run.sh"]
diff --git a/docker/build.sh b/docker/build.sh
new file mode 100755
index 000000000..908468d39
--- /dev/null
+++ b/docker/build.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Author  : Pawel Krupa (paulfantom)
+# Cross-arch docker build helper script
+# Needs docker in version >18.02 due to usage of manifests
+
+set -e
+
+if [ "$1" == "" ]; then
+    VERSION=$(git tag --points-at)
+else
+    VERSION="$1"
+fi
+if [ "${VERSION}" == "" ]; then
+    VERSION="latest"
+fi
+
+REPOSITORY="${REPOSITORY:-netdata}"
+
+echo "Building $VERSION of netdata container"
+
+declare -A ARCH_MAP
+ARCH_MAP=( ["i386"]="386" ["amd64"]="amd64" ["armhf"]="arm" ["aarch64"]="arm64")
+
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
+
+if [ -f Dockerfile ]; then
+    cd ../ || exit 1
+fi
+
+# Build images using multi-arch Dockerfile.
+for ARCH in i386 armhf aarch64 amd64; do
+     docker build --build-arg ARCH="${ARCH}-v3.8" --tag "${REPOSITORY}:${VERSION}-${ARCH}" --file docker/Dockerfile ./ &
+done
+wait
+
+# Create temporary docker CLI config with experimental features enabled (manifests v2 need it)
+mkdir -p /tmp/docker
+echo '{"experimental":"enabled"}' > /tmp/docker/config.json
+
+# Login to docker hub to allow for futher operations
+if [ -z ${DOCKER_USERNAME+x} ] || [ -z ${DOCKER_PASSWORD+x} ]; then
+    echo "No docker hub username or password specified. Exiting without pushing images to registry"
+    exit 1
+fi
+echo "$DOCKER_PASSWORD" | docker --config /tmp/docker login -u "$DOCKER_USERNAME" --password-stdin
+
+# Push images to registry
+for ARCH in amd64 i386 armhf aarch64; do
+    docker --config /tmp/docker push "${REPOSITORY}:${VERSION}-${ARCH}" &
+done
+wait
+
+# Recreate docker manifest
+docker --config /tmp/docker manifest create --amend \
+                       "${REPOSITORY}:${VERSION}" \
+                       "${REPOSITORY}:${VERSION}-i386" \
+                       "${REPOSITORY}:${VERSION}-armhf" \
+                       "${REPOSITORY}:${VERSION}-aarch64" \
+                       "${REPOSITORY}:${VERSION}-amd64"
+
+# Annotate manifest with CPU architecture information
+for ARCH in i386 armhf aarch64 amd64; do
+     docker --config /tmp/docker manifest annotate "${REPOSITORY}:${VERSION}" "${REPOSITORY}:${VERSION}-${ARCH}" --os linux --arch "${ARCH_MAP[$ARCH]}"
+done
+
+# Push manifest to docker hub
+docker --config /tmp/docker manifest push -p "${REPOSITORY}:${VERSION}"
+
+# Show current manifest (debugging purpose only)
+docker --config /tmp/docker manifest inspect "${REPOSITORY}:${VERSION}"
+
+# Push netdata images to firehol organization
+# TODO: Remove it after we decide to deprecate firehol/netdata docker repo
+if [ "$REPOSITORY" != "netdata" ]; then
+    echo "$OLD_DOCKER_PASSWORD" | docker login -u "$OLD_DOCKER_USERNAME" --password-stdin   
+    for ARCH in amd64 i386 armhf aarch64; do
+        docker tag "${REPOSITORY}:${VERSION}-${ARCH}" "firehol/netdata:${ARCH}"
+        docker push "firehol/netdata:${ARCH}"
+    done
+    docker tag "${REPOSITORY}:${VERSION}-amd64" "firehol/netdata:${VERSION}"
+    docker push "firehol/netdata:${VERSION}"
+fi
diff --git a/docker/run.sh b/docker/run.sh
new file mode 100644
index 000000000..b4cf52c7a
--- /dev/null
+++ b/docker/run.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+#set -e
+
+if [ ${PGID+x} ]; then
+  echo "Adding user netdata to group with id ${PGID}"
+  addgroup -g "${PGID}" -S hostgroup 2>/dev/null
+  sed -i "s/${PGID}:$/${PGID}:netdata/g" /etc/group
+fi
+
+exec /usr/sbin/netdata -u netdata -D -s /host -p "${NETDATA_PORT}" "$@"