Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-16 14:57:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/grafana] Release 9.1.6-debian-11-r0 (#7195)

Browse Source 
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
2022-09-20 19:39:06 +02:00
committed by GitHub
parent bc1fb01b61
commit 90314317d6
6 changed files with 73 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bitnami/grafana/9/debian-11/Dockerfile
View File

@@ -4,11 +4,11 @@ ARG TARGETARCH
LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
org.opencontainers.image.description="Application packaged by Bitnami" \
org.opencontainers.image.ref.name="9.1.5-debian-11-r2" \
org.opencontainers.image.ref.name="9.1.6-debian-11-r0" \
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/grafana" \
org.opencontainers.image.title="grafana" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="9.1.5"
org.opencontainers.image.version="9.1.6"
ENV HOME="/" \
OS_ARCH="${TARGETARCH:-amd64}" \
@@ -18,15 +18,15 @@ ENV HOME="/" \
COPY prebuildfs /
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# Install required system packages and dependencies
RUN install_packages acl ca-certificates curl gzip libc6 libfontconfig procps tar
RUN install_packages acl ca-certificates curl gzip libfontconfig procps tar
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
if [ ! -f grafana-9.1.5-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
curl -SsLf https://downloads.bitnami.com/files/stacksmith/grafana-9.1.5-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
curl -SsLf https://downloads.bitnami.com/files/stacksmith/grafana-9.1.5-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
if [ ! -f grafana-9.1.6-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
curl -SsLf https://downloads.bitnami.com/files/stacksmith/grafana-9.1.6-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
curl -SsLf https://downloads.bitnami.com/files/stacksmith/grafana-9.1.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
fi && \
sha256sum -c grafana-9.1.5-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
tar -zxf grafana-9.1.5-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
rm -rf grafana-9.1.5-0-linux-${OS_ARCH}-debian-11.tar.gz grafana-9.1.5-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256
sha256sum -c grafana-9.1.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
tar -zxf grafana-9.1.6-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
rm -rf grafana-9.1.6-0-linux-${OS_ARCH}-debian-11.tar.gz grafana-9.1.6-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
if [ ! -f gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
@@ -41,7 +41,7 @@ RUN chmod g+rwX /opt/bitnami
COPY rootfs /
RUN /opt/bitnami/scripts/grafana/postunpack.sh
ENV APP_VERSION="9.1.5" \
ENV APP_VERSION="9.1.6" \
BITNAMI_APP_NAME="grafana" \
PATH="/opt/bitnami/grafana/bin:/opt/bitnami/common/bin:$PATH"

4
bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
View File

@@ -8,9 +8,9 @@
},
"grafana": {
"arch": "amd64",
"digest": "20aa0a3fd3db0a2abbb3dc2878d4936d85212d152ac95157fd0f00f10eb98120",
"digest": "62541956609cfb6fc856f62e5ef53ce340cc0dad83f50dcdbf9f494a9135bc8b",
"distro": "debian-11",
"type": "NAMI",
"version": "9.1.5-0"
"version": "9.1.6-0"
}
}

55
bitnami/grafana/9/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
View File

@@ -197,6 +197,8 @@ am_i_root() {
# --version - Distro version
# --branch - Distro branch
# --codename - Distro codename
# --name - Distro name
# --pretty-name - Distro pretty name
# Returns:
# String
#########################
@@ -223,6 +225,12 @@ get_os_metadata() {
--codename)
get_os_release_metadata VERSION_CODENAME
;;
--name)
get_os_release_metadata NAME
;;
--pretty-name)
get_os_release_metadata PRETTY_NAME
;;
*)
error "Unknown flag ${flag_name}"
return 1
@@ -498,3 +506,50 @@ get_machine_id() {
fi
echo "$machine_id"
}
########################
# Get the root partition's disk device ID (e.g. /dev/sda1)
# Globals:
# None
# Arguments:
# None
# Returns:
# Root partition disk ID
#########################
get_disk_device_id() {
local device_id=""
if grep -q ^/dev /proc/mounts; then
device_id="$(grep -q ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)"
fi
# If it could not be autodetected, fallback to /dev/sda1 as a default
if [[ -z "$device_id" || ! -b "$device_id" ]]; then
device_id="/dev/sda1"
fi
echo "$device_id"
}
########################
# Get the root disk device ID (e.g. /dev/sda)
# Globals:
# None
# Arguments:
# None
# Returns:
# Root disk ID
#########################
get_root_disk_device_id() {
get_disk_device_id | sed 's/[0-9]\+$//'
}
########################
# Get the root disk size in bytes
# Globals:
# None
# Arguments:
# None
# Returns:
# Root disk size in bytes
#########################
get_root_disk_size() {
fdisk -l "$(get_root_disk_device_id)" | grep 'Disk.*bytes' | sed -E 's/.*, ([0-9]+) bytes,.*/\1/' || true
}

7
bitnami/grafana/9/debian-11/prebuildfs/usr/sbin/install_packages
View File

@@ -1,9 +1,10 @@
#!/bin/sh
set -e
set -u
export DEBIAN_FRONTEND=noninteractive
set -eu
n=0
max=2
export DEBIAN_FRONTEND=noninteractive
until [ $n -gt $max ]; do
set +e
(

2
bitnami/grafana/9/debian-11/tags-info.yaml
View File

@@ -1,5 +1,5 @@
rolling-tags:
- "9"
- "9-debian-11"
- "9.1.5"
- "9.1.6"
- "latest"

2
bitnami/grafana/README.md
View File

@@ -38,7 +38,7 @@ Non-root container images add an extra layer of security and are generally recom
Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
* [`9`, `9-debian-11`, `9.1.5`, `9.1.5-debian-11-r2`, `latest` (9/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/grafana/9/debian-11/Dockerfile)
* [`9`, `9-debian-11`, `9.1.6`, `9.1.6-debian-11-r0`, `latest` (9/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/grafana/9/debian-11/Dockerfile)
Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).