From 3185c77f28f3e0b2df485eda90e2248e6f8ac33a Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 1 Apr 2023 18:23:20 +0200 Subject: [PATCH] [bitnami/parse] Release 5.4.3-debian-11-r2 (#28974) Signed-off-by: Bitnami Containers --- bitnami/parse/5/debian-11/Dockerfile | 14 +++++++------- .../opt/bitnami/.bitnami_components.json | 10 +++++----- .../prebuildfs/opt/bitnami/scripts/libservice.sh | 12 +++++++++--- .../rootfs/opt/bitnami/scripts/parse-env.sh | 1 + 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/bitnami/parse/5/debian-11/Dockerfile b/bitnami/parse/5/debian-11/Dockerfile index 0b19fac9d209..b9ddf2dfbbb5 100644 --- a/bitnami/parse/5/debian-11/Dockerfile +++ b/bitnami/parse/5/debian-11/Dockerfile @@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-03-28T01:14:21Z" \ + org.opencontainers.image.created="2023-04-01T16:02:13Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.4.3-debian-11-r1" \ + org.opencontainers.image.ref.name="5.4.3-debian-11-r2" \ org.opencontainers.image.title="parse" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="5.4.3" @@ -22,11 +22,11 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl jq libbz2-1.0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "python-3.8.16-8-linux-${OS_ARCH}-debian-11" \ - "node-16.19.1-2-linux-${OS_ARCH}-debian-11" \ - "mongodb-shell-1.8.0-1-linux-${OS_ARCH}-debian-11" \ - "parse-5.4.3-0-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ + "python-3.8.16-9-linux-${OS_ARCH}-debian-11" \ + "node-16.20.0-1-linux-${OS_ARCH}-debian-11" \ + "mongodb-shell-1.8.0-3-linux-${OS_ARCH}-debian-11" \ + "parse-5.4.3-2-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 \ diff --git a/bitnami/parse/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/parse/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 0f9c0a340793..24a15089b61c 100644 --- a/bitnami/parse/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/parse/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,30 +3,30 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-3" + "version": "1.16.0-5" }, "mongodb-shell": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.8.0-1" + "version": "1.8.0-3" }, "node": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "16.19.1-2" + "version": "16.20.0-1" }, "parse": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "5.4.3-0" + "version": "5.4.3-2" }, "python": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "3.8.16-8" + "version": "3.8.16-9" } } \ No newline at end of file diff --git a/bitnami/parse/5/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/parse/5/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 6fcb304d34cc..d70cf0779ec8 100644 --- a/bitnami/parse/5/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/parse/5/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 @@ -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/parse/5/debian-11/rootfs/opt/bitnami/scripts/parse-env.sh b/bitnami/parse/5/debian-11/rootfs/opt/bitnami/scripts/parse-env.sh index 6718c5f16b57..dd968819e120 100644 --- a/bitnami/parse/5/debian-11/rootfs/opt/bitnami/scripts/parse-env.sh +++ b/bitnami/parse/5/debian-11/rootfs/opt/bitnami/scripts/parse-env.sh @@ -65,6 +65,7 @@ export PARSE_LOGS_DIR="${PARSE_BASE_DIR}/logs" export PARSE_PID_FILE="${PARSE_TMP_DIR}/parse.pid" export PARSE_LOG_FILE="${PARSE_LOGS_DIR}/parse.log" export PARSE_CONF_FILE="${PARSE_BASE_DIR}/config.json" +export PATH="${BITNAMI_ROOT_DIR}/node/bin:${PATH}" # Parse persistence configuration export PARSE_VOLUME_DIR="${BITNAMI_VOLUME_DIR}/parse"