From c6eed8cf9afd29071129b581d5acdad51f915c84 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 19 Jan 2024 22:23:20 +0100 Subject: [PATCH] [bitnami/grafana] Release 10.2.3-debian-11-r3 (#55000) Signed-off-by: Bitnami Containers --- bitnami/grafana/10/debian-11/Dockerfile | 5 ++-- bitnami/grafana/README.md | 40 +++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/bitnami/grafana/10/debian-11/Dockerfile b/bitnami/grafana/10/debian-11/Dockerfile index 022e555d17e0..9f908eb06f66 100644 --- a/bitnami/grafana/10/debian-11/Dockerfile +++ b/bitnami/grafana/10/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2024-01-10T11:35:55Z" \ + org.opencontainers.image.created="2024-01-19T20:25:15Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.2.3-debian-11-r2" \ + org.opencontainers.image.ref.name="10.2.3-debian-11-r3" \ org.opencontainers.image.title="grafana" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="10.2.3" @@ -40,6 +40,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami +RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true COPY rootfs / RUN /opt/bitnami/scripts/grafana/postunpack.sh diff --git a/bitnami/grafana/README.md b/bitnami/grafana/README.md index ab29f2e3c78e..e081eb69b2a3 100644 --- a/bitnami/grafana/README.md +++ b/bitnami/grafana/README.md @@ -92,6 +92,40 @@ We can launch another containers using the same flag (`--network NETWORK`) in th ## Configuration +### Environment variables + +#### Customizable environment variables + +| Name | Description | Default Value | +|-------------------------------|--------------------------------------------------------------------------------------|-----------------------------------------| +| `GRAFANA_TMP_DIR` | Grafana directory for temporary runtime files. | `${GRAFANA_BASE_DIR}/tmp` | +| `GRAFANA_PID_FILE` | Grafana PID file. | `${GRAFANA_TMP_DIR}/grafana.pid` | +| `GRAFANA_DEFAULT_PLUGINS_DIR` | Grafana directory for default plugins. | `${GRAFANA_BASE_DIR}/default-plugins` | +| `GF_PATHS_HOME` | Grafana home directory. | `$GRAFANA_BASE_DIR` | +| `GF_PATHS_CONFIG` | Grafana configuration file. | `${GRAFANA_BASE_DIR}/conf/grafana.ini` | +| `GF_PATHS_DATA` | Grafana directory for data files. | `${GRAFANA_BASE_DIR}/data` | +| `GF_PATHS_LOGS` | Grafana directory for log files. | `${GRAFANA_BASE_DIR}/logs` | +| `GF_PATHS_PLUGINS` | Grafana directory for plugins. | `${GF_PATHS_DATA}/plugins` | +| `GF_PATHS_PROVISIONING` | Grafana directory for provisioning configurations. | `${GRAFANA_BASE_DIR}/conf/provisioning` | +| `GF_INSTALL_PLUGINS_SKIP_TLS` | Whether to skip TLS certificate verification when installing plugins | `yes` | +| `GRAFANA_MIGRATION_LOCK` | Enable the migration lock mechanism to avoid issues caused by concurrent migrations. | `false` | +| `GRAFANA_SLEEP_TIME` | Sleep time between migration status check attempts. | `10` | +| `GRAFANA_RETRY_ATTEMPTS` | Number of retries to check migration status. | `12` | + +#### Read-only environment variables + +| Name | Description | Value | +|----------------------------|-------------------------------------------------------------|-------------------------------| +| `GRAFANA_BASE_DIR` | Grafana installation directory. | `${BITNAMI_ROOT_DIR}/grafana` | +| `GRAFANA_BIN_DIR` | Grafana directory for binary executables. | `${GRAFANA_BASE_DIR}/bin` | +| `GRAFANA_DAEMON_USER` | Grafana system user. | `grafana` | +| `GRAFANA_DAEMON_GROUP` | Grafana system group. | `grafana` | +| `GF_OP_PATHS_CONFIG` | Grafana Operator configuration directory. | `/etc/grafana/grafana.ini` | +| `GF_OP_PATHS_DATA` | Grafana Operator directory for data files. | `/var/lib/grafana` | +| `GF_OP_PATHS_LOGS` | Grafana Operator directory for log files. | `/var/log/grafana` | +| `GF_OP_PATHS_PROVISIONING` | Grafana Operator directory for provisioning configurations. | `/etc/grafana/provisioning` | +| `GF_OP_PLUGINS_INIT_DIR` | Grafana Operator directory for plugins. | `/opt/plugins` | + ### Dev config Update the `grafana.ini` configuration file in the `/opt/bitnami/grafana/conf` directory to override default configuration options. You only need to add the options you want to override. Config files are applied in the order of: @@ -258,6 +292,12 @@ You can still build your custom image adding your custom plugins or install them * Grafana doesn't ship the [`grafana-image-renderer` plugin](https://github.com/grafana/grafana-image-renderer/) by default anymore since it's not compatible with K8s distros with IPv6 disable. Instead, the `GF_INSTALL_PLUGINS` environment variable is set by default including this plugin so it's installed during the container's initialization, users can easily avoid it by overwriting the environment variable. +## Using `docker-compose.yaml` + +Please be aware this file has not undergone internal testing. Consequently, we advise its use exclusively for development or testing purposes. For production-ready deployments, we highly recommend utilizing its associated [Bitnami Helm chart](https://github.com/bitnami/charts/tree/main/bitnami/grafana). + +If you detect any issue in the `docker-compose.yaml` file, feel free to report it or contribute with a fix by following our [Contributing Guidelines](https://github.com/bitnami/containers/blob/main/CONTRIBUTING.md). + ## Contributing We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues) or submitting a [pull request](https://github.com/bitnami/containers/pulls) with your contribution.