change maintainer to label, bump grafana version

Docker/Countly/Dockerfile

@@ -1,8 +1,7 @@
 FROM countly/countly-server:16.06
 
-MAINTAINER Eugene Zilman <[email protected]>
+LABEL maintainer "Eugene Zilman <[email protected]>"
 
 # Add custom Countly configs - these in turn come from k8s volume
 ADD ./runit/countly-api.sh /etc/service/countly-api/run
 ADD ./runit/countly-dashboard.sh /etc/service/countly-dashboard/run
-

Docker/Wrk/Dockerfile

@@ -1,6 +1,6 @@
 FROM williamyeh/wrk:4.0.2
 
-MAINTAINER Eugene Zilman <[email protected]>
+LABEL maintainer "Eugene Zilman <[email protected]>"
 
 RUN apk add --update curl --no-cache
 

Docker/azure-cli/Dockerfile

@@ -1,5 +1,5 @@
 FROM azuresdk/azure-cli-python
-MAINTAINER "Hippie Hacker <[email protected]>"
+LABEL maintainer "Hippie Hacker <[email protected]>"
 COPY entrypoint.sh /
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["azure"]
+CMD ["azure"]

Docker/boinc/Dockerfile

@@ -1,15 +1,15 @@
 FROM phusion/baseimage:0.9.19
 
-MAINTAINER Eugene Zilman <[email protected]>
+LABEL maintainer "Eugene Zilman <[email protected]>"
 
 RUN apt update -y && \
     apt install -y boinc-client && \
-    apt-get clean &&  \ 
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* 
+    apt-get clean &&  \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN mkdir -p /var/lib/boinc-client/projects/www.worldcommunitygrid.org && \
     mkdir -p /var/lib/boinc-client/slots && \
-    chown -R boinc:boinc /var/lib/boinc-client 
+    chown -R boinc:boinc /var/lib/boinc-client
 
 ADD runner.sh /var/lib/boinc-client
 ADD attach.sh /var/lib/boinc-client

Docker/distcc-daemon/Dockerfile

@@ -1,10 +1,9 @@
 FROM zilman/kernel
-MAINTAINER Eugene Zilman <[email protected]>
+LABEL maintainer "Eugene Zilman <[email protected]>"
 
 RUN apt-get install -y distcc distcc-pump
 
 COPY config /etc/default/distcc
 COPY runner.sh /runner.sh
 
 ENTRYPOINT ["/runner.sh"]
-

Docker/distcc-master/Dockerfile

@@ -1,10 +1,9 @@
 FROM zilman/kernel
-MAINTAINER Eugene Zilman <[email protected]>
+LABEL maintainer "Eugene Zilman <[email protected]>"
 
 RUN apt-get install -y distcc distcc-pump
 
 COPY config /etc/default/distcc
 COPY runner.sh /runner.sh
 
 ENTRYPOINT ["/runner.sh"]
-

Docker/distcc/Dockerfile

@@ -1,5 +1,5 @@
 FROM debian:stable
-MAINTAINER Eugene Zilman <[email protected]>
+LABEL maintainer "Eugene Zilman <[email protected]>"
 
 RUN apt-get clean && apt update && apt install -y
 
@@ -11,4 +11,3 @@ COPY config /etc/default/distcc
 COPY runner.sh /runner.sh
 
 ENTRYPOINT ["/runner.sh"]
-

Docker/echo/Dockerfile

@@ -1,5 +1,5 @@
 FROM zilman/falcon
-MAINTAINER Eugene Zilman <[email protected]>
+LABEL maintainer "Eugene Zilman <[email protected]>"
 
 COPY echo.py /app.py
 

Docker/falcon/Dockerfile

@@ -1,5 +1,5 @@
 FROM zilman/gunicorn
-MAINTAINER Eugene Zilman <[email protected]>
+LABEL maintainer "Eugene Zilman <[email protected]>"
 
 RUN pip install meinheld falcon
 

Docker/fluentd-kubectl/Dockerfile

@@ -1,5 +1,5 @@
 FROM fluent/fluentd:latest-onbuild
-MAINTAINER Eugene Zilman <[email protected]>
+LABEL maintainer "Eugene Zilman <[email protected]>"
 WORKDIR /home/fluent
 ENV PATH /home/fluent/.gem/ruby/2.3.0/bin:$PATH
 ENV KUBE_LATEST_VERSION="v1.4.4"
@@ -20,4 +20,3 @@ RUN apk --no-cache add sudo build-base ruby-dev && \
 
 USER fluent
 CMD exec fluentd -c /fluentd/etc/$FLUENTD_CONF -p /fluentd/plugins $FLUENTD_OPT
-

Docker/fluentd-reportstats/Dockerfile

@@ -1,5 +1,5 @@
 FROM fluent/fluentd:latest-onbuild
-MAINTAINER Eugene Zilman <[email protected]>
+LABEL maintainer "Eugene Zilman <[email protected]>"
 WORKDIR /home/fluent
 ENV PATH /home/fluent/.gem/ruby/2.3.0/bin:$PATH
 

Docker/grafana/Dockerfile

@@ -1,4 +1,4 @@
-FROM grafana/grafana:3.1.1
+FROM grafana/grafana:4.5.2
 
 RUN apt-get update && \
     apt-get install -y curl

Docker/gunicorn/Dockerfile

@@ -1,10 +1,8 @@
 FROM python:2.7
-MAINTAINER Eugene Zilman <[email protected]>
+LABEL maintainer "Eugene Zilman <[email protected]>"
 
-RUN pip install gunicorn 
+RUN pip install gunicorn
 
 COPY gunicorn_conf.py /
 
-ENTRYPOINT ["/usr/local/bin/gunicorn", "--config", "/gunicorn_conf.py"] 
-
-
+ENTRYPOINT ["/usr/local/bin/gunicorn", "--config", "/gunicorn_conf.py"]

provisioning/Dockerfile

@@ -1,5 +1,5 @@
 FROM golang:alpine
-MAINTAINER "Denver Williams <[email protected]>"
+LABEL maintainer "Denver Williams <[email protected]>"
 ENV KUBECTL_VERSION=v1.5.2
 ENV HELM_VERSION=v2.4.1
 ENV GCLOUD_VERSION=150.0.0
@@ -39,7 +39,7 @@ tar xvzf helm-${HELM_VERSION}-linux-amd64.tar.gz && \
 mv linux-amd64/helm /usr/local/bin && \
 rm -rf helm-*gz linux-amd64
 
-# Install Terraform 
+# Install Terraform
 RUN wget https://releases.hashicorp.com/terraform/$TERRAFORM_VERSION/terraform_"${TERRAFORM_VERSION}"_linux_$ARC.zip
 RUN unzip terraform*.zip -d /usr/bin