mirror of
https://github.com/bitnami/containers.git
synced 2026-10-17 17:54:14 +02:00
[bitnami/opensearch-dashboards] Release 2.12.0-debian-12-r1 (#63397)
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
@@ -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-23T03:06:40Z" \
|
||||
org.opencontainers.image.created="2024-02-26T12:31:27Z" \
|
||||
org.opencontainers.image.description="Application packaged by VMware, Inc" \
|
||||
org.opencontainers.image.licenses="Apache-2.0" \
|
||||
org.opencontainers.image.ref.name="2.12.0-debian-12-r0" \
|
||||
org.opencontainers.image.ref.name="2.12.0-debian-12-r1" \
|
||||
org.opencontainers.image.title="opensearch-dashboards" \
|
||||
org.opencontainers.image.vendor="VMware, Inc." \
|
||||
org.opencontainers.image.version="2.12.0"
|
||||
@@ -27,7 +27,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
|
||||
RUN install_packages ca-certificates curl libgcc-s1 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" \
|
||||
"opensearch-dashboards-2.12.0-0-linux-${OS_ARCH}-debian-12" \
|
||||
) ; \
|
||||
for COMPONENT in "${COMPONENTS[@]}"; do \
|
||||
|
||||
+1
-1
@@ -9,6 +9,6 @@
|
||||
"arch": "amd64",
|
||||
"distro": "debian-12",
|
||||
"type": "NAMI",
|
||||
"version": "4.41.1-0"
|
||||
"version": "4.42.1-0"
|
||||
}
|
||||
}
|
||||
+4
@@ -75,6 +75,8 @@ export OPENSEARCH_DASHBOARDS_BASE_DIR="${BITNAMI_ROOT_DIR}/opensearch-dashboards
|
||||
export SERVER_BASE_DIR="$OPENSEARCH_DASHBOARDS_BASE_DIR"
|
||||
export OPENSEARCH_DASHBOARDS_CONF_DIR="${SERVER_BASE_DIR}/config"
|
||||
export SERVER_CONF_DIR="$OPENSEARCH_DASHBOARDS_CONF_DIR"
|
||||
export OPENSEARCH_DASHBOARDS_DEFAULT_CONF_DIR="${SERVER_BASE_DIR}/config.default"
|
||||
export SERVER_DEFAULT_CONF_DIR="$OPENSEARCH_DASHBOARDS_DEFAULT_CONF_DIR"
|
||||
export OPENSEARCH_DASHBOARDS_LOGS_DIR="${SERVER_BASE_DIR}/logs"
|
||||
export SERVER_LOGS_DIR="$OPENSEARCH_DASHBOARDS_LOGS_DIR"
|
||||
export OPENSEARCH_DASHBOARDS_TMP_DIR="${SERVER_BASE_DIR}/tmp"
|
||||
@@ -83,6 +85,8 @@ export OPENSEARCH_DASHBOARDS_BIN_DIR="${SERVER_BASE_DIR}/bin"
|
||||
export SERVER_BIN_DIR="$OPENSEARCH_DASHBOARDS_BIN_DIR"
|
||||
export OPENSEARCH_DASHBOARDS_PLUGINS_DIR="${SERVER_BASE_DIR}/plugins"
|
||||
export SERVER_PLUGINS_DIR="$OPENSEARCH_DASHBOARDS_PLUGINS_DIR"
|
||||
export OPENSEARCH_DASHBOARDS_DEFAULT_PLUGINS_DIR="${SERVER_BASE_DIR}/plugins.default"
|
||||
export SERVER_DEFAULT_PLUGINS_DIR="$OPENSEARCH_DASHBOARDS_DEFAULT_PLUGINS_DIR"
|
||||
export OPENSEARCH_DASHBOARDS_DATA_DIR="${SERVER_VOLUME_DIR}/data"
|
||||
export SERVER_DATA_DIR="$OPENSEARCH_DASHBOARDS_DATA_DIR"
|
||||
export OPENSEARCH_DASHBOARDS_MOUNTED_CONF_DIR="${SERVER_VOLUME_DIR}/conf"
|
||||
|
||||
+19
@@ -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/opensearch-dashboards/run.sh" ]]; then
|
||||
info "** Starting Opensearch Dashboards setup **"
|
||||
/opt/bitnami/scripts/opensearch-dashboards/setup.sh
|
||||
|
||||
+16
-1
@@ -16,7 +16,7 @@ set -o pipefail
|
||||
# Load environment
|
||||
. /opt/bitnami/scripts/opensearch-dashboards-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
|
||||
|
||||
Reference in New Issue
Block a user