From a1740fc87f36a24525a60c267020a1d8fd7d799a Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 22 Feb 2023 15:13:22 +0100 Subject: [PATCH] [bitnami/elasticsearch] Release 7.17.9-debian-11-r9 (#24881) Signed-off-by: Bitnami Containers --- bitnami/elasticsearch/7/debian-11/Dockerfile | 8 ++--- .../opt/bitnami/.bitnami_components.json | 6 ++-- .../opt/bitnami/scripts/libservice.sh | 33 +++++++++---------- bitnami/elasticsearch/README.md | 2 +- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/bitnami/elasticsearch/7/debian-11/Dockerfile b/bitnami/elasticsearch/7/debian-11/Dockerfile index ff388925c705..a0a0f4d1073a 100644 --- a/bitnami/elasticsearch/7/debian-11/Dockerfile +++ b/bitnami/elasticsearch/7/debian-11/Dockerfile @@ -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-02-20T14:47:39Z" \ + org.opencontainers.image.created="2023-02-22T13:42: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-r8" \ + org.opencontainers.image.ref.name="7.17.9-debian-11-r9" \ org.opencontainers.image.title="elasticsearch" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="7.17.9" @@ -26,9 +26,9 @@ 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.31.1-0-linux-${OS_ARCH}-debian-11" \ - "java-17.0.6-10-1-linux-${OS_ARCH}-debian-11" \ + "java-17.0.6-10-2-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ - "elasticsearch-7.17.9-3-linux-${OS_ARCH}-debian-11" \ + "elasticsearch-7.17.9-4-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 7818c14bbbc0..de8f252d0cdb 100644 --- a/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -4,7 +4,7 @@ "digest": "c4fc25c8948bb5c5945049ebab3fda18139efe982e2a855b94d92d67db2b2fb9", "distro": "debian-11", "type": "NAMI", - "version": "7.17.9-3" + "version": "7.17.9-4" }, "gosu": { "arch": "amd64", @@ -15,10 +15,10 @@ }, "java": { "arch": "amd64", - "digest": "616d810dc3a926249db7843e25676da79c536a6fb01af626cd6ce88d7aa4c3e1", + "digest": "09eb316f02e065beb59e8c3cc8f2f908879faf7f4902cd1cc4b9fcd25bd528ca", "distro": "debian-11", "type": "NAMI", - "version": "17.0.6-10-1" + "version": "17.0.6-10-2" }, "yq": { "arch": "amd64", diff --git a/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index f964ab09fcba..af64e198ad2d 100644 --- a/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/elasticsearch/7/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -305,6 +305,8 @@ generate_systemd_conf() { local exec_reload="" local restart="always" local pid_file="" + local standard_output="journal" + local standard_error="" # Parse CLI flags shift while [[ "$#" -gt 0 ]]; do @@ -318,6 +320,8 @@ generate_systemd_conf() { | --exec-reload \ | --restart \ | --pid-file \ + | --standard-output \ + | --standard-error \ ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift @@ -362,36 +366,33 @@ ExecStart=${exec_start} EOF # Optional stop and reload commands if [[ -n "$exec_stop" ]]; then - cat >> "$service_file" <> "$service_file" <<< "ExecStop=${exec_stop}" fi if [[ -n "$exec_reload" ]]; then - cat >> "$service_file" <> "$service_file" <<< "ExecReload=${exec_reload}" fi # User and group if [[ -n "$user" ]]; then - cat >> "$service_file" <> "$service_file" <<< "User=${user}" fi if [[ -n "$group" ]]; then - cat >> "$service_file" <> "$service_file" <<< "Group=${group}" fi # PID file allows to determine if the main process is running properly (for Restart=always) if [[ -n "$pid_file" ]]; then - cat >> "$service_file" <> "$service_file" <<< "PIDFile=${pid_file}" fi # Environment flags (may be specified multiple times in a unit) if [[ -n "$environment" ]]; then cat >> "$service_file" <<< "$environment" fi + # Logging + if [[ -n "$standard_output" ]]; then + cat >> "$service_file" <<< "StandardOutput=${standard_output}" + fi + if [[ -n "$standard_error" ]]; then + cat >> "$service_file" <<< "StandardError=${standard_error}" + fi cat >> "$service_file" < +* This is temporary solution while Elasticsearch maintainers address an issue with ownership/permissions when installing plugins. ### 6.8.2-debian-9-r36, 6.8.2-ol-7-r36, 7.3.1-debian-9-r8, 7.3.1-ol-7-r13