From fddabfadabcdfc8a0fa428b5a7688a74877ee60b Mon Sep 17 00:00:00 2001 From: Gordon Kelly Date: Sun, 14 Jan 2018 15:15:55 +0000 Subject: docker: updated grafana image to continue to send API request to grafana Updated grafana image to continue to send API request to grafana server at 1 sec intervals at start time until grafana server is up and listening on port. Dashboards folder has been moved to /opt/grafana/dashboards. Documentation updated accordingly for all changes Change-Id: I748b05372f0aa0890d3befa5645834fb217db784 Signed-off-by: gordonkelly --- docker/barometer-grafana/Dockerfile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'docker/barometer-grafana/Dockerfile') diff --git a/docker/barometer-grafana/Dockerfile b/docker/barometer-grafana/Dockerfile index 32a78862..610e8086 100644 --- a/docker/barometer-grafana/Dockerfile +++ b/docker/barometer-grafana/Dockerfile @@ -1,6 +1,11 @@ -FROM grafana/grafana:latest +FROM grafana/grafana:4.6.3 -COPY ./configure_grafana.sh / +ENV grafana_folder /opt/grafana +RUN mkdir -p ${grafana_folder}/dashboards/ + +COPY ./configure_grafana.sh ${grafana_folder} COPY ./run.sh / -COPY ./dashboards/ /var/lib/grafana/dashboards/ -RUN chmod 755 run.sh configure_grafana.sh +COPY ./dashboards/ ${grafana_folder}/dashboards/ + +WORKDIR $grafana_folder +RUN chmod 755 /run.sh configure_grafana.sh -- cgit 1.2.3-korg