From 3b059c2c881cba6a1da5e144a6b349e2d1469700 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 27 Mar 2023 23:05:37 +0200 Subject: [PATCH] [bitnami/kibana] Release 7.17.9-debian-11-r16 (#28394) Signed-off-by: Bitnami Containers --- bitnami/kibana/7/debian-11/Dockerfile | 6 ++--- .../opt/bitnami/.bitnami_components.json | 5 +--- .../opt/bitnami/scripts/libservice.sh | 2 +- .../opt/bitnami/scripts/libwebserver.sh | 24 +++++++++++++++---- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/bitnami/kibana/7/debian-11/Dockerfile b/bitnami/kibana/7/debian-11/Dockerfile index 2bc557df64fa..d2d34073b916 100644 --- a/bitnami/kibana/7/debian-11/Dockerfile +++ b/bitnami/kibana/7/debian-11/Dockerfile @@ -3,10 +3,10 @@ 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-22T13:02:08Z" \ + org.opencontainers.image.created="2023-03-27T20:28:53Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.17.9-debian-11-r15" \ + org.opencontainers.image.ref.name="7.17.9-debian-11-r16" \ org.opencontainers.image.title="kibana" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="7.17.9" @@ -23,7 +23,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libexpat1 libgcc-s1 libnss3 libstdc++6 procps RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "yq-4.32.2-0-linux-${OS_ARCH}-debian-11" \ + "yq-4.33.1-0-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ "kibana-7.17.9-0-linux-${OS_ARCH}-debian-11" \ ) && \ diff --git a/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index b688b3f05ce0..2465949df5d3 100644 --- a/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,23 +1,20 @@ { "gosu": { "arch": "amd64", - "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", "version": "1.16.0-3" }, "kibana": { "arch": "amd64", - "digest": "c10a5f25706557a792ce45542b605f01184c95f6bcc07e49c888f636e5287714", "distro": "debian-11", "type": "NAMI", "version": "7.17.9-0" }, "yq": { "arch": "amd64", - "digest": "e09f11557e4dfd4170495f320d5ce5655c57ac9be844f81f27066cce84c1bad8", "distro": "debian-11", "type": "NAMI", - "version": "4.32.2-0" + "version": "4.33.1-0" } } \ No newline at end of file diff --git a/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d4b7af6fd3a..6fcb304d34cc 100644 --- a/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -395,7 +395,7 @@ PartOf=bitnami.service Type=${type} EOF if [[ -n "$working_directory" ]]; then - cat >> "$service_file" <<< "WorkingDirectory=$working_directory" + cat >> "$service_file" <<< "WorkingDirectory=${working_directory}" fi if [[ -n "$exec_start_pre" ]]; then # This variable may contain multiple ExecStartPre= directives diff --git a/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..5860791219cf 100644 --- a/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/kibana/7/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -112,7 +112,11 @@ is_web_server_running() { ######################### web_server_start() { info "Starting $(web_server_type) in background" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl start "bitnami.$(web_server_type).service" + fi } ######################## @@ -126,7 +130,11 @@ web_server_start() { ######################### web_server_stop() { info "Stopping $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl stop "bitnami.$(web_server_type).service" + fi } ######################## @@ -140,7 +148,11 @@ web_server_stop() { ######################### web_server_restart() { info "Restarting $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl restart "bitnami.$(web_server_type).service" + fi } ######################## @@ -153,7 +165,11 @@ web_server_restart() { # None ######################### web_server_reload() { - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl reload "bitnami.$(web_server_type).service" + fi } ########################