From bcf76c400e143a52c6145f59d64809c1bdfa6da4 Mon Sep 17 00:00:00 2001 From: leanderkunstmann <45664740+leanderkunstmann@users.noreply.github.com> Date: Fri, 13 Mar 2020 10:36:35 +0100 Subject: [PATCH 1/2] Update Dockerfile --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 67b6230..e01e14b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,8 @@ MAINTAINER Erik Jacobs USER root EXPOSE 3000 -ENV GRAFANA_VERSION="4.3.1" - ADD root / -RUN yum -y install https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-"$GRAFANA_VERSION"-1.x86_64.rpm \ +RUN yum -y install https://dl.grafana.com/oss/release/grafana-6.6.2-1.x86_64.rpm \ && yum clean all COPY run.sh /usr/share/grafana/ RUN /usr/bin/fix-permissions /usr/share/grafana \ From a445100dff700787328373f135bf853e581b32b8 Mon Sep 17 00:00:00 2001 From: leanderkunstmann <45664740+leanderkunstmann@users.noreply.github.com> Date: Fri, 13 Mar 2020 10:37:39 +0100 Subject: [PATCH 2/2] Update openshift-grafana-template.yaml --- openshift-grafana-template.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openshift-grafana-template.yaml b/openshift-grafana-template.yaml index deac2ba..97e04ba 100644 --- a/openshift-grafana-template.yaml +++ b/openshift-grafana-template.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Template metadata: - name: grafana-openshift + name: grafana-openshift-v-6.6 parameters: - name: GIT_URI displayName: Git repository URI description: location of the grafana git repo - value: https://github.com/OpenShiftDemos/grafana-openshift + value: https://github.com/leanderkunstmann/grafana-openshift - description: Github trigger secret. A difficult to guess string encoded as part of the webhook URL. Not encrypted. displayName: GitHub Webhook Secret