From 27b5884c597ef8a45f5457e53b8d86da98742ab2210f4bcd41404abc7cdf7b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Tue, 2 Jan 2024 08:29:44 +0000 Subject: [PATCH] [info=b18737c71d4b2a2ee9c21fc30f8d3545] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/grafana-image?expand=0&rev=52 --- Dockerfile | 2 +- grafana-image.changes | 5 +++++ run.sh | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 75c8469..ae6ed42 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/grafana-image.changes b/grafana-image.changes index dc0be0a..218c40c 100644 --- a/grafana-image.changes +++ b/grafana-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 2 08:26:58 UTC 2024 - Dirk Mueller + +- update year to 2024 + ------------------------------------------------------------------- Thu Sep 28 14:29:10 UTC 2023 - Dirk Mueller diff --git a/run.sh b/run.sh index 6a018b7..c56f4c4 100644 --- a/run.sh +++ b/run.sh @@ -70,14 +70,14 @@ if [ ! -z "${GF_INSTALL_PLUGINS}" ]; then if [[ $plugin =~ .*\;.* ]]; then pluginUrl=$(echo "$plugin" | cut -d';' -f 1) pluginInstallFolder=$(echo "$plugin" | cut -d';' -f 2) - grafana-cli --pluginUrl ${pluginUrl} --pluginsDir "${GF_PATHS_PLUGINS}" plugins install "${pluginInstallFolder}" + grafana cli --pluginUrl ${pluginUrl} --pluginsDir "${GF_PATHS_PLUGINS}" plugins install "${pluginInstallFolder}" else - grafana-cli --pluginsDir "${GF_PATHS_PLUGINS}" plugins install ${plugin} + grafana cli --pluginsDir "${GF_PATHS_PLUGINS}" plugins install ${plugin} fi done fi -exec grafana-server \ +exec grafana server \ --homepath="$GF_PATHS_HOME" \ --config="$GF_PATHS_CONFIG" \ --packaging=docker \