From 38bb4c8324da1ddc3fe97f02e6f89d1cc3b15835 Mon Sep 17 00:00:00 2001 From: kev Date: Mon, 22 May 2017 06:50:13 +0800 Subject: [PATCH] update netdata --- netdata/Dockerfile | 2 +- netdata/arm/Dockerfile | 8 +++----- netdata/arm/docker-compose.yml | 7 +++++++ netdata/docker-compose.yml | 2 ++ 4 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 netdata/arm/docker-compose.yml diff --git a/netdata/Dockerfile b/netdata/Dockerfile index 6155425..3f26618 100644 --- a/netdata/Dockerfile +++ b/netdata/Dockerfile @@ -37,4 +37,4 @@ VOLUME /etc/netdata EXPOSE 19999 -CMD ["netdata", "-nd"] +CMD ["netdata", "-D"] diff --git a/netdata/arm/Dockerfile b/netdata/arm/Dockerfile index 9b7784f..ed7e85e 100644 --- a/netdata/arm/Dockerfile +++ b/netdata/arm/Dockerfile @@ -17,14 +17,13 @@ RUN set -xe \ autoconf-archive \ autogen \ automake \ + build-essential \ curl \ debhelper \ dh-autoreconf \ dh-systemd \ fakeroot \ - gcc \ libmnl-dev \ - make \ pkg-config \ uuid-dev \ zlib1g-dev \ @@ -38,12 +37,11 @@ RUN set -xe \ autoconf-archive \ autogen \ automake \ + build-essential \ curl \ debhelper \ dh-autoreconf \ dh-systemd \ - gcc \ - make \ pkg-config \ && rm -rf netdata-${NETDATA_VER} /var/lib/apt/lists/* @@ -51,4 +49,4 @@ VOLUME /etc/netdata EXPOSE 19999 -CMD ["netdata", "-nd"] +CMD ["netdata", "-D"] diff --git a/netdata/arm/docker-compose.yml b/netdata/arm/docker-compose.yml new file mode 100644 index 0000000..d8b837d --- /dev/null +++ b/netdata/arm/docker-compose.yml @@ -0,0 +1,7 @@ +netdata: + image: easypi/netdata-arm + volumes: + - /var/run/docker.sock:/var/run/docker.sock:ro + net: host + pid: host + restart: always diff --git a/netdata/docker-compose.yml b/netdata/docker-compose.yml index b006d08..d4d10e3 100644 --- a/netdata/docker-compose.yml +++ b/netdata/docker-compose.yml @@ -1,5 +1,7 @@ netdata: image: vimagick/netdata + volumes: + - /var/run/docker.sock:/var/run/docker.sock:ro net: host pid: host restart: always