mirror of
https://github.com/bitnami/containers.git
synced 2026-10-18 07:26:33 +02:00
[bitnami/grafana] Release 9.4.3-debian-11-r0 (#26121)
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
@@ -3,13 +3,13 @@ FROM docker.io/bitnami/minideb:bullseye
|
||||
ARG TARGETARCH
|
||||
|
||||
LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
|
||||
org.opencontainers.image.created="2023-03-02T18:49:48Z" \
|
||||
org.opencontainers.image.created="2023-03-03T09:55:47Z" \
|
||||
org.opencontainers.image.description="Application packaged by VMware, Inc" \
|
||||
org.opencontainers.image.licenses="Apache-2.0" \
|
||||
org.opencontainers.image.ref.name="9.4.2-debian-11-r0" \
|
||||
org.opencontainers.image.ref.name="9.4.3-debian-11-r0" \
|
||||
org.opencontainers.image.title="grafana" \
|
||||
org.opencontainers.image.vendor="VMware, Inc." \
|
||||
org.opencontainers.image.version="9.4.2"
|
||||
org.opencontainers.image.version="9.4.3"
|
||||
|
||||
ENV HOME="/" \
|
||||
OS_ARCH="${TARGETARCH:-amd64}" \
|
||||
@@ -22,7 +22,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||
RUN install_packages ca-certificates curl libfontconfig procps
|
||||
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
|
||||
COMPONENTS=( \
|
||||
"grafana-9.4.2-0-linux-${OS_ARCH}-debian-11" \
|
||||
"grafana-9.4.3-0-linux-${OS_ARCH}-debian-11" \
|
||||
"gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \
|
||||
) && \
|
||||
for COMPONENT in "${COMPONENTS[@]}"; do \
|
||||
@@ -40,7 +40,7 @@ RUN chmod g+rwX /opt/bitnami
|
||||
|
||||
COPY rootfs /
|
||||
RUN /opt/bitnami/scripts/grafana/postunpack.sh
|
||||
ENV APP_VERSION="9.4.2" \
|
||||
ENV APP_VERSION="9.4.3" \
|
||||
BITNAMI_APP_NAME="grafana" \
|
||||
PATH="/opt/bitnami/grafana/bin:/opt/bitnami/common/bin:$PATH"
|
||||
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
},
|
||||
"grafana": {
|
||||
"arch": "amd64",
|
||||
"digest": "582764d1829879fb936c2e1b750a2e15298bc0b1c9ee00aa6ea624b5a220b2c1",
|
||||
"digest": "73016f09dbaed48f31794159f0af77b82f0bbedcee767867465c9f6e7df017be",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "9.4.2-0"
|
||||
"version": "9.4.3-0"
|
||||
}
|
||||
}
|
||||
@@ -277,16 +277,21 @@ remove_logrotate_conf() {
|
||||
# Arguments:
|
||||
# $1 - Service name
|
||||
# Flags:
|
||||
# --custom-service-content - Custom content to add to the [service] block
|
||||
# --environment - Environment variable to define (multiple --environment options may be passed)
|
||||
# --environment-file - Text file with environment variables
|
||||
# --exec-start - Start command (required)
|
||||
# --exec-stop - Stop command (optional)
|
||||
# --exec-reload - Reload command (optional)
|
||||
# --group - System group to start the service with
|
||||
# --name - Service full name (e.g. Apache HTTP Server, defaults to $1)
|
||||
# --restart - When to restart the Systemd service after being stopped (defaults to always)
|
||||
# --pid-file - Service PID file (required when --restart is set to always)
|
||||
# --pid-file - Service PID file
|
||||
# --standard-output - File where to print stdout output
|
||||
# --standard-error - File where to print stderr output
|
||||
# --success-exit-status - Exit code that indicates a successful shutdown
|
||||
# --type - Systemd unit type (defaults to forking)
|
||||
# --user - System user to start the service with
|
||||
# --group - System group to start the service with
|
||||
# --environment - Environment variable to define (multiple --environment options may be passed)
|
||||
# Returns:
|
||||
# None
|
||||
#########################
|
||||
@@ -300,6 +305,7 @@ generate_systemd_conf() {
|
||||
local user=""
|
||||
local group=""
|
||||
local environment=""
|
||||
local environment_file=""
|
||||
local exec_start=""
|
||||
local exec_stop=""
|
||||
local exec_reload=""
|
||||
@@ -307,6 +313,9 @@ generate_systemd_conf() {
|
||||
local pid_file=""
|
||||
local standard_output="journal"
|
||||
local standard_error=""
|
||||
local limits_content=""
|
||||
local success_exit_status=""
|
||||
local custom_service_content=""
|
||||
# Parse CLI flags
|
||||
shift
|
||||
while [[ "$#" -gt 0 ]]; do
|
||||
@@ -315,6 +324,7 @@ generate_systemd_conf() {
|
||||
| --type \
|
||||
| --user \
|
||||
| --group \
|
||||
| --environment-file \
|
||||
| --exec-start \
|
||||
| --exec-stop \
|
||||
| --exec-reload \
|
||||
@@ -322,10 +332,18 @@ generate_systemd_conf() {
|
||||
| --pid-file \
|
||||
| --standard-output \
|
||||
| --standard-error \
|
||||
| --success-exit-status \
|
||||
| --custom-service-content \
|
||||
)
|
||||
var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
|
||||
shift
|
||||
declare "$var_name"="${1:?"$var_name" is missing}"
|
||||
declare "$var_name"="${1:?"${var_name} value is missing"}"
|
||||
;;
|
||||
--limit-*)
|
||||
[[ -n "$limits_content" ]] && limits_content+=$'\n'
|
||||
var_name="${1//--limit-}"
|
||||
shift
|
||||
limits_content+="Limit${var_name^^}=${1:?"--limit-${var_name} value is missing"}"
|
||||
;;
|
||||
--environment)
|
||||
shift
|
||||
@@ -346,10 +364,6 @@ generate_systemd_conf() {
|
||||
error "The --exec-start option is required"
|
||||
error="yes"
|
||||
fi
|
||||
if [[ "$restart" = "always" && -z "$pid_file" ]]; then
|
||||
error "The --restart option cannot be set to 'always' if --pid-file is not set"
|
||||
error="yes"
|
||||
fi
|
||||
if [[ "$error" != "no" ]]; then
|
||||
return 1
|
||||
fi
|
||||
@@ -382,10 +396,16 @@ EOF
|
||||
if [[ -n "$pid_file" ]]; then
|
||||
cat >> "$service_file" <<< "PIDFile=${pid_file}"
|
||||
fi
|
||||
if [[ -n "$restart" ]]; then
|
||||
cat >> "$service_file" <<< "Restart=${restart}"
|
||||
fi
|
||||
# Environment flags (may be specified multiple times in a unit)
|
||||
if [[ -n "$environment" ]]; then
|
||||
cat >> "$service_file" <<< "$environment"
|
||||
fi
|
||||
if [[ -n "$environment_file" ]]; then
|
||||
cat >> "$service_file" <<< "EnvironmentFile=${environment_file}"
|
||||
fi
|
||||
# Logging
|
||||
if [[ -n "$standard_output" ]]; then
|
||||
cat >> "$service_file" <<< "StandardOutput=${standard_output}"
|
||||
@@ -393,14 +413,28 @@ EOF
|
||||
if [[ -n "$standard_error" ]]; then
|
||||
cat >> "$service_file" <<< "StandardError=${standard_error}"
|
||||
fi
|
||||
if [[ -n "$custom_service_content" ]]; then
|
||||
cat >> "$service_file" <<< "$custom_service_content"
|
||||
fi
|
||||
if [[ -n "$success_exit_status" ]]; then
|
||||
cat >> "$service_file" <<EOF
|
||||
# When the process receives a SIGTERM signal, it exits with code ${success_exit_status}
|
||||
SuccessExitStatus=${success_exit_status}
|
||||
EOF
|
||||
fi
|
||||
cat >> "$service_file" <<EOF
|
||||
Restart=${restart}
|
||||
# Optimizations
|
||||
TimeoutSec=5min
|
||||
IgnoreSIGPIPE=no
|
||||
KillMode=mixed
|
||||
EOF
|
||||
if [[ -n "$limits_content" ]]; then
|
||||
cat >> "$service_file" <<EOF
|
||||
# Limits
|
||||
LimitNOFILE=infinity
|
||||
${limits_content}
|
||||
EOF
|
||||
fi
|
||||
cat >> "$service_file" <<EOF
|
||||
|
||||
[Install]
|
||||
# Enabling/disabling the main bitnami service should cause the same effect for this service
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
rolling-tags:
|
||||
- "9"
|
||||
- 9-debian-11
|
||||
- 9.4.2
|
||||
- 9.4.3
|
||||
- latest
|
||||
|
||||
Reference in New Issue
Block a user