public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[bitnami/elasticsearch] Release 7.17.9-debian-11-r27 (#30916) 

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot 2023-04-19 22:34:01 +02:00 committed by GitHub
parent 2f9c42f823
commit 4d606ca905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 102 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bitnami/elasticsearch/7/debian-11/Dockerfile
View File

@ -5,10 +5,10 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
ARG TARGETARCH
LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
org.opencontainers.image.created="2023-04-16T17:28:19Z" \
org.opencontainers.image.created="2023-04-19T19:54:47Z" \
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-r26" \
org.opencontainers.image.ref.name="7.17.9-debian-11-r27" \
org.opencontainers.image.title="elasticsearch" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="7.17.9"
@ -26,8 +26,7 @@ RUN install_packages ca-certificates curl libasound2-dev libc6 libfreetype6 libf
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
COMPONENTS=( \
"yq-4.33.3-0-linux-${OS_ARCH}-debian-11" \
"java-17.0.6-10-4-linux-${OS_ARCH}-debian-11" \
"gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \
"java-17.0.7-7-0-linux-${OS_ARCH}-debian-11" \
"elasticsearch-7.17.9-7-linux-${OS_ARCH}-debian-11" \
) && \
for COMPONENT in "${COMPONENTS[@]}"; do \

8
bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
View File

@ -5,17 +5,11 @@
"type": "NAMI",
"version": "7.17.9-7"
},
"gosu": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "1.16.0-5"
},
"java": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "17.0.6-10-4"
"version": "17.0.7-7-0"
},
"yq": {
"arch": "amd64",

95
bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
View File

@ -553,3 +553,98 @@ get_root_disk_device_id() {
get_root_disk_size() {
fdisk -l "$(get_root_disk_device_id)" | grep 'Disk.*bytes' | sed -E 's/.*, ([0-9]+) bytes,.*/\1/' || true
}
########################
# Run command as a specific user and group (optional)
# Arguments:
# $1 - USER(:GROUP) to switch to
# $2..$n - command to execute
# Returns:
# Exit code of the specified command
#########################
run_as_user() {
run_chroot "$@"
}
########################
# Execute command as a specific user and group (optional),
# replacing the current process image
# Arguments:
# $1 - USER(:GROUP) to switch to
# $2..$n - command to execute
# Returns:
# Exit code of the specified command
#########################
exec_as_user() {
run_chroot --replace-process "$@"
}
########################
# Run a command using chroot
# Arguments:
# $1 - USER(:GROUP) to switch to
# $2..$n - command to execute
# Flags:
# -r | --replace-process - Replace the current process image (optional)
# Returns:
# Exit code of the specified command
#########################
run_chroot() {
local userspec
local user
local homedir
local replace=false
local -r cwd="$(pwd)"
# Parse and validate flags
while [[ "$#" -gt 0 ]]; do
case "$1" in
-r | --replace-process)
replace=true
;;
--)
shift
break
;;
-*)
stderr_print "unrecognized flag $1"
return 1
;;
*)
break
;;
esac
shift
done
# Parse and validate arguments
if [[ "$#" -lt 2 ]]; then
echo "expected at least 2 arguments"
return 1
else
userspec=$1
shift
# userspec can optionally include the group, so we parse the user
user=$(echo "$userspec" | cut -d':' -f1)
fi
if ! am_i_root; then
error "Could not switch to '${userspec}': Operation not permitted"
return 1
fi
# Get the HOME directory for the user to switch, as chroot does
# not properly update this env and some scripts rely on it
homedir=$(eval echo "~${user}")
if [[ ! -d $homedir ]]; then
homedir="${HOME:-/}"
fi
# Obtaining value for "$@" indirectly in order to properly support shell parameter expansion
if [[ "$replace" = true ]]; then
exec chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@"
else
chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@"
fi
}

2
bitnami/elasticsearch/7/debian-11/rootfs/opt/bitnami/scripts/elasticsearch/run.sh
View File

@ -27,7 +27,7 @@ ARGS+=("$@")
info "** Starting Elasticsearch **"
if am_i_root; then
exec gosu "$ELASTICSEARCH_DAEMON_USER" "$EXEC" "${ARGS[@]}"
exec_as_user "$ELASTICSEARCH_DAEMON_USER" "$EXEC" "${ARGS[@]}"
else
exec "$EXEC" "${ARGS[@]}"
fi

4
bitnami/elasticsearch/7/debian-11/rootfs/opt/bitnami/scripts/libelasticsearch.sh
View File

@ -142,7 +142,7 @@ elasticsearch_start() {
debug "Starting Elasticsearch..."
local command=("${ELASTICSEARCH_BASE_DIR}/bin/elasticsearch" "-d" "-p" "${ELASTICSEARCH_TMP_DIR}/elasticsearch.pid")
am_i_root && command=("gosu" "$ELASTICSEARCH_DAEMON_USER" "${command[@]}")
am_i_root && command=("run_as_user" "$ELASTICSEARCH_DAEMON_USER" "${command[@]}")
if [[ "$BITNAMI_DEBUG" = true ]]; then
"${command[@]}" &
else
@ -891,7 +891,7 @@ elasticsearch_custom_init_scripts() {
#########################
elasticsearch_get_version() {
local -a elasticsearch_cmd=("elasticsearch" "--version")
am_i_root && elasticsearch_cmd=("gosu" "$ELASTICSEARCH_DAEMON_USER" "${elasticsearch_cmd[@]}")
am_i_root && elasticsearch_cmd=("run_as_user" "$ELASTICSEARCH_DAEMON_USER" "${elasticsearch_cmd[@]}")
if [[ -f "$ELASTICSEARCH_CONF_FILE" ]]; then
ES_JAVA_OPTS="-Xms1m -Xmx20m" "${elasticsearch_cmd[@]}" | grep Version: | awk -F "," '{print $1}' | awk -F ":" '{print $2}'
else