[bitnami/kibana] Release 8.12.2-debian-12-r1 (#63398)

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

bitnami/kibana/8/debian-12/Dockerfile

@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-02-22T18:17:19Z" \
+      org.opencontainers.image.created="2024-02-26T12:30:36Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.12.2-debian-12-r0" \
+      org.opencontainers.image.ref.name="8.12.2-debian-12-r1" \
       org.opencontainers.image.title="kibana" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.12.2"
@@ -27,7 +27,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-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.41.1-0-linux-${OS_ARCH}-debian-12" \
+      "yq-4.42.1-0-linux-${OS_ARCH}-debian-12" \
       "kibana-8.12.2-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \

bitnami/kibana/8/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json

@@ -9,6 +9,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "4.41.1-0"
+        "version": "4.42.1-0"
     }
 }

bitnami/kibana/8/debian-12/rootfs/opt/bitnami/scripts/kibana-env.sh

@@ -83,6 +83,8 @@ export KIBANA_BASE_DIR="${BITNAMI_ROOT_DIR}/kibana"
 export SERVER_BASE_DIR="$KIBANA_BASE_DIR"
 export KIBANA_CONF_DIR="${SERVER_BASE_DIR}/config"
 export SERVER_CONF_DIR="$KIBANA_CONF_DIR"
+export KIBANA_DEFAULT_CONF_DIR="${SERVER_BASE_DIR}/config.default"
+export SERVER_DEFAULT_CONF_DIR="$KIBANA_DEFAULT_CONF_DIR"
 export KIBANA_LOGS_DIR="${SERVER_BASE_DIR}/logs"
 export SERVER_LOGS_DIR="$KIBANA_LOGS_DIR"
 export KIBANA_TMP_DIR="${SERVER_BASE_DIR}/tmp"
@@ -91,6 +93,8 @@ export KIBANA_BIN_DIR="${SERVER_BASE_DIR}/bin"
 export SERVER_BIN_DIR="$KIBANA_BIN_DIR"
 export KIBANA_PLUGINS_DIR="${SERVER_BASE_DIR}/plugins"
 export SERVER_PLUGINS_DIR="$KIBANA_PLUGINS_DIR"
+export KIBANA_DEFAULT_PLUGINS_DIR="${SERVER_BASE_DIR}/plugins.default"
+export SERVER_DEFAULT_PLUGINS_DIR="$KIBANA_DEFAULT_PLUGINS_DIR"
 export KIBANA_DATA_DIR="${SERVER_VOLUME_DIR}/data"
 export SERVER_DATA_DIR="$KIBANA_DATA_DIR"
 export KIBANA_MOUNTED_CONF_DIR="${SERVER_VOLUME_DIR}/conf"

bitnami/kibana/8/debian-12/rootfs/opt/bitnami/scripts/kibana/entrypoint.sh

@@ -19,6 +19,25 @@ set -o pipefail
 
 print_welcome_page
 
+# We add the copy from default config in the entrypoint to not break users 
+# bypassing the setup.sh logic. If the file already exists do not overwrite (in
+# case someone mounts a configuration file in /opt/bitnami/elasticsearch/conf)
+debug "Copying files from $SERVER_DEFAULT_CONF_DIR to $SERVER_CONF_DIR"
+cp -nr "$SERVER_DEFAULT_CONF_DIR"/. "$SERVER_CONF_DIR"
+
+if ! is_dir_empty "$SERVER_DEFAULT_PLUGINS_DIR"; then
+    debug "Copying plugins from $SERVER_DEFAULT_PLUGINS_DIR to $SERVER_PLUGINS_DIR"
+    # Copy the plugins installed by default to the plugins directory
+    # If there is already a plugin with the same name in the plugins folder do nothing
+    for plugin_path in "${SERVER_DEFAULT_PLUGINS_DIR}"/*; do
+        plugin_name="$(basename "$plugin_path")"
+        plugin_moved_path="${SERVER_PLUGINS_DIR}/${plugin_name}"
+        if ! [[ -d "$plugin_moved_path" ]]; then
+            cp -r "$plugin_path" "$plugin_moved_path" 
+        fi
+    done
+fi
+
 if [[ "$1" = "/opt/bitnami/scripts/kibana/run.sh" ]]; then
     info "** Starting Kibana setup **"
     /opt/bitnami/scripts/kibana/setup.sh

bitnami/kibana/8/debian-12/rootfs/opt/bitnami/scripts/kibana/postunpack.sh

@@ -16,7 +16,7 @@ set -o pipefail
 # Load environment
 . /opt/bitnami/scripts/kibana-env.sh
 
-for dir in "$SERVER_TMP_DIR" "$SERVER_LOGS_DIR" "$SERVER_CONF_DIR" "$SERVER_PLUGINS_DIR" "$SERVER_VOLUME_DIR" "$SERVER_DATA_DIR" "$SERVER_INITSCRIPTS_DIR"; do
+for dir in "$SERVER_TMP_DIR" "$SERVER_LOGS_DIR" "$SERVER_CONF_DIR" "$SERVER_DEFAULT_CONF_DIR" "$SERVER_PLUGINS_DIR" "$SERVER_DEFAULT_PLUGINS_DIR" "$SERVER_VOLUME_DIR" "$SERVER_DATA_DIR" "$SERVER_INITSCRIPTS_DIR"; do
     ensure_dir_exists "$dir"
     chmod -R ug+rwX "$dir"
 done
@@ -24,3 +24,18 @@ done
 kibana_conf_set "path.data" "$SERVER_DATA_DIR"
 # For backwards compatibility, create a symlink to the default path
 ! is_dir_empty "${SERVER_BASE_DIR}/data" || rm -rf "${SERVER_BASE_DIR}/data" && ln -s "$SERVER_DATA_DIR" "${SERVER_BASE_DIR}/data"
+
+# Copy all initially generated configuration files to the default directory
+# (this is to avoid breaking when entrypoint is being overridden)
+cp -r "${SERVER_CONF_DIR}/"* "$SERVER_DEFAULT_CONF_DIR"
+chmod o+rX -R "$SERVER_DEFAULT_CONF_DIR"
+
+if ! is_dir_empty "$SERVER_PLUGINS_DIR"; then
+    # Move all initially installed plugins to the default plugins directory.
+    for plugin_path in "${SERVER_PLUGINS_DIR}"/*; do
+        plugin_name="$(basename "$plugin_path")"
+        plugin_moved_path="${SERVER_DEFAULT_PLUGINS_DIR}/${plugin_name}"
+        mv "$plugin_path" "$plugin_moved_path"
+    done
+    chmod o+rX -R "$SERVER_DEFAULT_PLUGINS_DIR"
+fi