mirror of
https://github.com/bitnami/containers.git
synced 2026-02-11 14:37:20 +08:00
[bitnami/opensearch] Release 3.1.0-debian-12-r1 (#83444)
Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
This commit is contained in:
@@ -10,10 +10,9 @@ ARG TARGETARCH
|
||||
|
||||
LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
|
||||
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
|
||||
org.opencontainers.image.created="2025-06-25T00:01:16Z" \
|
||||
org.opencontainers.image.created="2025-07-17T02:47:19Z" \
|
||||
org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
|
||||
org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/opensearch/README.md" \
|
||||
org.opencontainers.image.ref.name="3.1.0-debian-12-r0" \
|
||||
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/opensearch" \
|
||||
org.opencontainers.image.title="opensearch" \
|
||||
org.opencontainers.image.vendor="Broadcom, Inc." \
|
||||
@@ -33,8 +32,8 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
|
||||
DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
|
||||
mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
|
||||
COMPONENTS=( \
|
||||
"yq-4.45.4-3-linux-${OS_ARCH}-debian-12" \
|
||||
"jre-21.0.7-9-0-linux-${OS_ARCH}-debian-12" \
|
||||
"yq-4.46.1-0-linux-${OS_ARCH}-debian-12" \
|
||||
"jre-21.0.8-12-0-linux-${OS_ARCH}-debian-12" \
|
||||
"opensearch-3.1.0-0-linux-${OS_ARCH}-debian-12" \
|
||||
) ; \
|
||||
for COMPONENT in "${COMPONENTS[@]}"; do \
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"arch": "amd64",
|
||||
"distro": "debian-12",
|
||||
"type": "NAMI",
|
||||
"version": "21.0.7-9-0"
|
||||
"version": "21.0.8-12-0"
|
||||
},
|
||||
"opensearch": {
|
||||
"arch": "amd64",
|
||||
@@ -15,6 +15,6 @@
|
||||
"arch": "amd64",
|
||||
"distro": "debian-12",
|
||||
"type": "NAMI",
|
||||
"version": "4.45.4-3"
|
||||
"version": "4.46.1-0"
|
||||
}
|
||||
}
|
||||
@@ -389,7 +389,8 @@ elasticsearch_validate() {
|
||||
if [ -n "$DB_NODE_ROLES" ]; then
|
||||
read -r -a roles_list <<<"$(get_elasticsearch_roles)"
|
||||
local master_role="master"
|
||||
[[ "$DB_FLAVOR" = "opensearch" && "$APP_VERSION" =~ ^2\. ]] && master_role="cluster_manager"
|
||||
local major_version="$(get_sematic_version "$(elasticsearch_get_version)" 1)"
|
||||
[[ "$DB_FLAVOR" = "opensearch" && "$major_version" -eq 2 ]] && master_role="cluster_manager"
|
||||
if [[ "${#roles_list[@]}" -le 0 ]]; then
|
||||
warn "Setting ${DB_FLAVOR^^}_NODE_ROLES is empty and ${DB_FLAVOR^^}_IS_DEDICATED_NODE is set to true, ${DB_FLAVOR^} will be configured as coordinating-only node."
|
||||
fi
|
||||
@@ -409,7 +410,7 @@ elasticsearch_validate() {
|
||||
am_i_root && ensure_user_exists "$DB_DAEMON_USER" --group "$DB_DAEMON_GROUP"
|
||||
for dir in "$DB_TMP_DIR" "$DB_LOGS_DIR" "$DB_PLUGINS_DIR" "$DB_BASE_DIR/modules" "$DB_CONF_DIR"; do
|
||||
ensure_dir_exists "$dir"
|
||||
am_i_root && chown -R "$DB_DAEMON_USER:$DB_DAEMON_GROUP" "$dir"
|
||||
am_i_root && chown -R "$DB_DAEMON_USER:$DB_DAEMON_GROUP" "$dir" || true
|
||||
done
|
||||
|
||||
debug "Validating settings in DB_* env vars..."
|
||||
@@ -491,10 +492,12 @@ get_elasticsearch_hostname() {
|
||||
# Array of node roles
|
||||
#########################
|
||||
get_elasticsearch_roles() {
|
||||
local major_version="$(get_sematic_version "$(elasticsearch_get_version)" 1)"
|
||||
|
||||
read -r -a roles_list_tmp <<<"$(tr ',;' ' ' <<<"$DB_NODE_ROLES")"
|
||||
roles_list=("${roles_list_tmp[@]}")
|
||||
for i in "${!roles_list[@]}"; do
|
||||
if [[ ${roles_list[$i]} == "master" ]] && [[ "$DB_FLAVOR" = "opensearch" && "$APP_VERSION" =~ ^2\. ]]; then
|
||||
if [[ ${roles_list[$i]} == "master" ]] && [[ "$DB_FLAVOR" = "opensearch" && "$major_version" -eq 2 ]]; then
|
||||
roles_list[i]="cluster_manager"
|
||||
fi
|
||||
done
|
||||
@@ -554,7 +557,8 @@ elasticsearch_cluster_configuration() {
|
||||
fi
|
||||
elasticsearch_conf_set discovery.seed_hosts "${host_list[@]}"
|
||||
if is_node_master; then
|
||||
if [[ "$DB_FLAVOR" = "opensearch" && "$APP_VERSION" =~ ^2\. ]]; then
|
||||
local major_version="$(get_sematic_version "$(elasticsearch_get_version)" 1)"
|
||||
if [[ "$DB_FLAVOR" = "opensearch" && "$major_version" -eq 2 ]]; then
|
||||
elasticsearch_conf_set cluster.initial_cluster_manager_nodes "${master_list[@]}"
|
||||
else
|
||||
elasticsearch_conf_set cluster.initial_master_nodes "${master_list[@]}"
|
||||
@@ -716,7 +720,7 @@ elasticsearch_initialize() {
|
||||
debug "Ensuring expected directories/files exist..."
|
||||
for dir in "$DB_TMP_DIR" "$DB_LOGS_DIR" "$DB_PLUGINS_DIR" "$DB_BASE_DIR/modules" "$DB_CONF_DIR"; do
|
||||
ensure_dir_exists "$dir"
|
||||
am_i_root && chown -R "$DB_DAEMON_USER:$DB_DAEMON_GROUP" "$dir"
|
||||
am_i_root && chown -R "$DB_DAEMON_USER:$DB_DAEMON_GROUP" "$dir" || true
|
||||
done
|
||||
for dir in "${data_dirs_list[@]}"; do
|
||||
ensure_dir_exists "$dir"
|
||||
@@ -960,3 +964,26 @@ elasticsearch_healthcheck() {
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
########################
|
||||
# Extract opensearch version from version string
|
||||
# Globals:
|
||||
# DB_*
|
||||
# Arguments:
|
||||
# None
|
||||
# Returns:
|
||||
# Version string
|
||||
#########################
|
||||
elasticsearch_get_version() {
|
||||
local ver_string
|
||||
local -a ver_split
|
||||
|
||||
if [[ "$DB_FLAVOR" = "opensearch" ]]; then
|
||||
ver_string=$("${DB_BIN_DIR}/opensearch" "--version" 2>/dev/null)
|
||||
else
|
||||
ver_string=$("${DB_BIN_DIR}/elasticsearch" "--version" 2>/dev/null)
|
||||
fi
|
||||
|
||||
read -r -a ver_split <<< "$ver_string"
|
||||
echo "${ver_split[1]::-1}"
|
||||
}
|
||||
|
||||
@@ -17,10 +17,6 @@ set -o pipefail
|
||||
# Load environment
|
||||
. /opt/bitnami/scripts/opensearch-env.sh
|
||||
|
||||
if [[ "$APP_VERSION" =~ ^1\. ]]; then
|
||||
export OPENSEARCH_SECURITY_CONF_DIR="${OPENSEARCH_SECURITY_DIR}/securityconfig"
|
||||
fi
|
||||
|
||||
# Ensure Opensearch environment variables settings are valid
|
||||
elasticsearch_validate
|
||||
# Ensure Opensearch is stopped when this script ends
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
rolling-tags:
|
||||
- "3"
|
||||
- 3-debian-12
|
||||
- 3.1.0
|
||||
- latest
|
||||
Reference in New Issue
Block a user