From f6b018e761eb0e21733ff2d4092de50f3c0ac580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20C=C3=A9sar=20de=20Azevedo?= Date: Sun, 5 May 2019 16:53:40 +1200 Subject: [PATCH 1/2] Changed images and permission to Grafana Added support to ARM devices, the base image have changed to allow the startup on Raspiberry Pi --- docker-compose.yml | 6 +++--- speedweb/Dockerfile | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 073fc8b..faa6816 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: db: - image: influxdb:alpine + image: influxdb container_name: influxdb volumes: - "./data/influxdb/:/var/lib/influxdb" @@ -12,8 +12,8 @@ services: env_file: - ./env/db.env web: - # build: ./speedweb - image: pedrocesarti/internet-speedtest-docker:grafana + # build: ./speedweb + image: pedrocesarti/internet-speedtest-docker:speedweb container_name: speedweb ports: - "3000:3000" diff --git a/speedweb/Dockerfile b/speedweb/Dockerfile index 6fa4f25..c2a2ffb 100644 --- a/speedweb/Dockerfile +++ b/speedweb/Dockerfile @@ -1,4 +1,4 @@ -FROM grafana/grafana:4.5.0 +FROM grafana/grafana MAINTAINER Pedro César de Azevedo ADD conf/grafana.db /var/lib/grafana/grafana.db @@ -7,4 +7,11 @@ ADD conf/home.json /usr/share/grafana/public/dashboards/home.json ENV GF_SERVER_ROOT_URL http://localhost ENV GF_SECURITY_ADMIN_PASSWORD admin ENV GF_AUTH_ANONYMOUS_ENABLED true + +USER root +RUN chown -R root:root /etc/grafana && \ + chmod -R a+r /etc/grafana && \ + chown -R grafana:grafana /var/lib/grafana + +USER grafana ENTRYPOINT ["/run.sh"] From a03c6b8771801e84d698dac3dda9088ae9844f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20C=C3=A9sar=20de=20Azevedo?= Date: Sun, 5 May 2019 16:58:30 +1200 Subject: [PATCH 2/2] Update documentation --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 8f3cf1a..38d3201 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,6 @@ Repositories used to * [influxdb](https://hub.docker.com/_/influxdb/) * [Grafana](https://hub.docker.com/r/grafana/grafana/) -* [tutumcloud/grafana](https://github.com/tutumcloud/grafana) * [SpeedTest](https://github.com/sivel/speedtest-cli/) Enjoy! :)