From 288d69ad0d70b07aa8da7cdb8cc56d5193d67970 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 12 Apr 2023 09:45:30 +0200 Subject: [PATCH] [bitnami/schema-registry] Release 7.0.9-debian-11-r0 (#30021) Signed-off-by: Bitnami Containers --- .../schema-registry/7.0/debian-11/Dockerfile | 14 +++++------ .../opt/bitnami/.bitnami_components.json | 9 +++---- .../opt/bitnami/scripts/libservice.sh | 14 +++++++---- .../opt/bitnami/scripts/libwebserver.sh | 24 +++++++++++++++---- .../7.0/debian-11/tags-info.yaml | 2 +- 5 files changed, 41 insertions(+), 22 deletions(-) diff --git a/bitnami/schema-registry/7.0/debian-11/Dockerfile b/bitnami/schema-registry/7.0/debian-11/Dockerfile index 42c816a6b64b..55cd94ff0462 100644 --- a/bitnami/schema-registry/7.0/debian-11/Dockerfile +++ b/bitnami/schema-registry/7.0/debian-11/Dockerfile @@ -4,13 +4,13 @@ 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-03-19T00:15:39Z" \ + org.opencontainers.image.created="2023-04-12T07:02:14Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="7.0.8-debian-11-r7" \ + org.opencontainers.image.ref.name="7.0.9-debian-11-r0" \ org.opencontainers.image.title="schema-registry" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="7.0.8" + org.opencontainers.image.version="7.0.9" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -23,9 +23,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl netcat procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "java-11.0.18-10-3-linux-${OS_ARCH}-debian-11" \ - "schema-registry-7.0.8-1-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ + "java-11.0.18-10-4-linux-${OS_ARCH}-debian-11" \ + "schema-registry-7.0.9-0-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -44,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/schema-registry/postunpack.sh -ENV APP_VERSION="7.0.8" \ +ENV APP_VERSION="7.0.9" \ BITNAMI_APP_NAME="schema-registry" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/schema-registry/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/schema-registry/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/schema-registry/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 1869ecdb4ad8..4e5f2a809a87 100644 --- a/bitnami/schema-registry/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/schema-registry/7.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,23 +1,20 @@ { "gosu": { "arch": "amd64", - "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-3" + "version": "1.16.0-5" }, "java": { "arch": "amd64", - "digest": "fbdf266273a4dd4c5fc37c344462aa50047549aa2e63858ffee5594ea450fca5", "distro": "debian-11", "type": "NAMI", - "version": "11.0.18-10-3" + "version": "11.0.18-10-4" }, "schema-registry": { "arch": "amd64", - "digest": "c4884c4cd2132532f13a325fcfd458e0466e9f919d811970a01468074f28b500", "distro": "debian-11", "type": "NAMI", - "version": "7.0.8-1" + "version": "7.0.9-0" } } \ No newline at end of file diff --git a/bitnami/schema-registry/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/schema-registry/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d4b7af6fd3a..d70cf0779ec8 100644 --- a/bitnami/schema-registry/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/schema-registry/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -279,7 +279,7 @@ remove_logrotate_conf() { # Flags: # --custom-service-content - Custom content to add to the [service] block # --environment - Environment variable to define (multiple --environment options may be passed) -# --environment-file - Text file with environment variables +# --environment-file - Text file with environment variables (multiple --environment-file options may be passed) # --exec-start - Start command (required) # --exec-start-pre - Pre-start command (optional) # --exec-start-post - Post-start command (optional) @@ -330,7 +330,6 @@ generate_systemd_conf() { | --type \ | --user \ | --group \ - | --environment-file \ | --exec-start \ | --exec-stop \ | --exec-reload \ @@ -368,6 +367,12 @@ generate_systemd_conf() { [[ -n "$environment" ]] && environment+=$'\n' environment+="Environment=${1:?"--environment value is missing"}" ;; + --environment-file) + shift + # It is possible to add multiple environment-file lines + [[ -n "$environment_file" ]] && environment_file+=$'\n' + environment_file+="EnvironmentFile=${1:?"--environment-file value is missing"}" + ;; *) echo "Invalid command line flag ${1}" >&2 return 1 @@ -395,7 +400,7 @@ PartOf=bitnami.service Type=${type} EOF if [[ -n "$working_directory" ]]; then - cat >> "$service_file" <<< "WorkingDirectory=$working_directory" + cat >> "$service_file" <<< "WorkingDirectory=${working_directory}" fi if [[ -n "$exec_start_pre" ]]; then # This variable may contain multiple ExecStartPre= directives @@ -435,7 +440,8 @@ EOF cat >> "$service_file" <<< "$environment" fi if [[ -n "$environment_file" ]]; then - cat >> "$service_file" <<< "EnvironmentFile=${environment_file}" + # This variable may contain multiple EnvironmentFile= directives + cat >> "$service_file" <<< "$environment_file" fi # Logging if [[ -n "$standard_output" ]]; then diff --git a/bitnami/schema-registry/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/schema-registry/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..94745ebe419e 100644 --- a/bitnami/schema-registry/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/schema-registry/7.0/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -112,7 +112,11 @@ is_web_server_running() { ######################### web_server_start() { info "Starting $(web_server_type) in background" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then + systemctl start "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + fi } ######################## @@ -126,7 +130,11 @@ web_server_start() { ######################### web_server_stop() { info "Stopping $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then + systemctl stop "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + fi } ######################## @@ -140,7 +148,11 @@ web_server_stop() { ######################### web_server_restart() { info "Restarting $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then + systemctl restart "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + fi } ######################## @@ -153,7 +165,11 @@ web_server_restart() { # None ######################### web_server_reload() { - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then + systemctl reload "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + fi } ######################## diff --git a/bitnami/schema-registry/7.0/debian-11/tags-info.yaml b/bitnami/schema-registry/7.0/debian-11/tags-info.yaml index 99e45ee608a8..3b96183541de 100644 --- a/bitnami/schema-registry/7.0/debian-11/tags-info.yaml +++ b/bitnami/schema-registry/7.0/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "7.0" - 7.0-debian-11 -- 7.0.8 +- 7.0.9