From 0b0e48486fa755c2db6c10015fe4262d4899346d Mon Sep 17 00:00:00 2001 From: openeuler_bot Date: Thu, 20 Nov 2025 00:11:32 +0000 Subject: [PATCH] 24.03-lts-sp2 update grafana to 12.3.0 --- Cloud/grafana/12.3.0/24.03-lts-sp2/Dockerfile | 31 +++++++++ .../12.3.0/24.03-lts-sp2/entrypoint.sh | 68 +++++++++++++++++++ Cloud/grafana/README.md | 1 + Cloud/grafana/doc/image-info.yml | 1 + Cloud/grafana/meta.yml | 4 +- 5 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 Cloud/grafana/12.3.0/24.03-lts-sp2/Dockerfile create mode 100644 Cloud/grafana/12.3.0/24.03-lts-sp2/entrypoint.sh diff --git a/Cloud/grafana/12.3.0/24.03-lts-sp2/Dockerfile b/Cloud/grafana/12.3.0/24.03-lts-sp2/Dockerfile new file mode 100644 index 00000000..90d2d14f --- /dev/null +++ b/Cloud/grafana/12.3.0/24.03-lts-sp2/Dockerfile @@ -0,0 +1,31 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp2 +FROM ${BASE} + +ARG TARGETARCH +ARG BUILDARCH +ARG VERSION=12.3.0 + +COPY ./entrypoint.sh / +RUN yum -y update && \ + if [ "$TARGETARCH" = "amd64" ]; then \ + BUILDARCH="x86_64"; \ + elif [ "$TARGETARCH" = "arm64" ]; then \ + BUILDARCH="aarch64"; \ + fi && \ + yum install -y https://dl.grafana.com/enterprise/release/grafana-enterprise-${VERSION}-1.${BUILDARCH}.rpm && \ + yum clean all && \ + chmod 755 /entrypoint.sh + + +ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \ + GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \ + GF_PATHS_DATA="/var/lib/grafana" \ + GF_PATHS_HOME="/usr/share/grafana" \ + GF_PATHS_LOGS="/var/log/grafana" \ + GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \ + GF_PATHS_PROVISIONING="/etc/grafana/provisioning" + +EXPOSE 3000 + +USER grafana +ENTRYPOINT [ "/entrypoint.sh" ] diff --git a/Cloud/grafana/12.3.0/24.03-lts-sp2/entrypoint.sh b/Cloud/grafana/12.3.0/24.03-lts-sp2/entrypoint.sh new file mode 100644 index 00000000..3c5ddf7e --- /dev/null +++ b/Cloud/grafana/12.3.0/24.03-lts-sp2/entrypoint.sh @@ -0,0 +1,68 @@ +#!/bin/bash -e + +PERMISSIONS_OK=0 + +if [ ! -r "$GF_PATHS_CONFIG" ]; then + echo "GF_PATHS_CONFIG='$GF_PATHS_CONFIG' is not readable." + PERMISSIONS_OK=1 +fi + +if [ ! -w "$GF_PATHS_DATA" ]; then + echo "GF_PATHS_DATA='$GF_PATHS_DATA' is not writable." + PERMISSIONS_OK=1 +fi + +if [ ! -r "$GF_PATHS_HOME" ]; then + echo "GF_PATHS_HOME='$GF_PATHS_HOME' is not readable." + PERMISSIONS_OK=1 +fi + +if [ $PERMISSIONS_OK -eq 1 ]; then + echo "You may have issues with file permissions, more information here: http://docs.grafana.org/installation/docker/#migrate-to-v51-or-later" +fi + +if [ ! -d "$GF_PATHS_PLUGINS" ]; then + mkdir "$GF_PATHS_PLUGINS" +fi + +# Convert all environment variables with names ending in __FILE into the content of +# the file that they point at and use the name without the trailing __FILE. +# This can be used to carry in Docker secrets. +for VAR_NAME in $(env | grep '^GF_[^=]\+__FILE=.\+' | sed -r "s/([^=]*)__FILE=.*/\1/g"); do + VAR_NAME_FILE="$VAR_NAME"__FILE + if [ "${!VAR_NAME}" ]; then + echo >&2 "ERROR: Both $VAR_NAME and $VAR_NAME_FILE are set (but are exclusive)" + exit 1 + fi + echo "Getting secret $VAR_NAME from ${!VAR_NAME_FILE}" + export "$VAR_NAME"="$(< "${!VAR_NAME_FILE}")" + unset "$VAR_NAME_FILE" +done + +export HOME="$GF_PATHS_HOME" + +if [ ! -z "${GF_INSTALL_PLUGINS}" ]; then + OLDIFS=$IFS + IFS=',' + for plugin in ${GF_INSTALL_PLUGINS}; do + IFS=$OLDIFS + 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}" + else + grafana-cli --pluginsDir "${GF_PATHS_PLUGINS}" plugins install ${plugin} + fi + done +fi + +exec grafana-server \ + --homepath="$GF_PATHS_HOME" \ + --config="$GF_PATHS_CONFIG" \ + --packaging=docker \ + "$@" \ + cfg:default.log.mode="console" \ + cfg:default.paths.data="$GF_PATHS_DATA" \ + cfg:default.paths.logs="$GF_PATHS_LOGS" \ + cfg:default.paths.plugins="$GF_PATHS_PLUGINS" \ + cfg:default.paths.provisioning="$GF_PATHS_PROVISIONING" diff --git a/Cloud/grafana/README.md b/Cloud/grafana/README.md index b1e21b32..bb9a487a 100644 --- a/Cloud/grafana/README.md +++ b/Cloud/grafana/README.md @@ -17,6 +17,7 @@ Learn more on [Grafana website](https://grafana.com/docs/grafana/latest/introduc The tag of each grafana docker image is consist of the version of grafana and the version of basic image. The details are as follows | Tags | Currently | Architectures| |--|--|--| +|[12.3.0-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/grafana/12.3.0/24.03-lts-sp2/Dockerfile) | grafana 12.3.0 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[12.2.1-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/grafana/12.2.1/24.03-lts-sp2/Dockerfile) | grafana 12.2.1 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[12.2.0-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/grafana/12.2.0/24.03-lts-sp2/Dockerfile) | grafana 12.2.0 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[12.1.1-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/grafana/12.1.1/24.03-lts-sp2/Dockerfile) | grafana 12.1.1 on openEuler 24.03-LTS-SP2 | amd64, arm64 | diff --git a/Cloud/grafana/doc/image-info.yml b/Cloud/grafana/doc/image-info.yml index eabce83d..7aaf9e65 100644 --- a/Cloud/grafana/doc/image-info.yml +++ b/Cloud/grafana/doc/image-info.yml @@ -11,6 +11,7 @@ tags: | | Tag | Currently | Architectures | |----------|-------------|------------------| + |[12.3.0-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/grafana/12.3.0/24.03-lts-sp2/Dockerfile) | grafana 12.3.0 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[12.2.1-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/grafana/12.2.1/24.03-lts-sp2/Dockerfile) | grafana 12.2.1 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[12.2.0-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/grafana/12.2.0/24.03-lts-sp2/Dockerfile) | grafana 12.2.0 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[12.1.1-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Cloud/grafana/12.1.1/24.03-lts-sp2/Dockerfile) | grafana 12.1.1 on openEuler 24.03-LTS-SP2 | amd64, arm64 | diff --git a/Cloud/grafana/meta.yml b/Cloud/grafana/meta.yml index 754ffc7f..5e014a37 100644 --- a/Cloud/grafana/meta.yml +++ b/Cloud/grafana/meta.yml @@ -49,4 +49,6 @@ 12.2.0-oe2403sp2: path: 12.2.0/24.03-lts-sp2/Dockerfile 12.2.1-oe2403sp2: - path: 12.2.1/24.03-lts-sp2/Dockerfile \ No newline at end of file + path: 12.2.1/24.03-lts-sp2/Dockerfile +12.3.0-oe2403sp2: + path: 12.3.0/24.03-lts-sp2/Dockerfile \ No newline at end of file -- Gitee