From d9990f213899a0f7cf59fe6758e817e6c052a272 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 1 Apr 2023 12:45:30 +0200 Subject: [PATCH] [bitnami/clickhouse] Release 23.3.1-debian-11-r0 (#28722) Signed-off-by: Bitnami Containers --- bitnami/clickhouse/23/debian-11/Dockerfile | 12 ++++++------ .../prebuildfs/opt/bitnami/.bitnami_components.json | 4 ++-- .../prebuildfs/opt/bitnami/scripts/libservice.sh | 12 +++++++++--- bitnami/clickhouse/23/debian-11/tags-info.yaml | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/bitnami/clickhouse/23/debian-11/Dockerfile b/bitnami/clickhouse/23/debian-11/Dockerfile index fde108b7f083..2954d7045035 100644 --- a/bitnami/clickhouse/23/debian-11/Dockerfile +++ b/bitnami/clickhouse/23/debian-11/Dockerfile @@ -3,13 +3,13 @@ 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-27T22:22:47Z" \ + org.opencontainers.image.created="2023-04-01T10:20:58Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="23.2.4-debian-11-r5" \ + org.opencontainers.image.ref.name="23.3.1-debian-11-r0" \ org.opencontainers.image.title="clickhouse" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="23.2.4" + org.opencontainers.image.version="23.3.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -22,8 +22,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl procps xmlstarlet RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ - "clickhouse-23.2.4-1-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ + "clickhouse-23.3.1-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -41,7 +41,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/clickhouse/postunpack.sh -ENV APP_VERSION="23.2.4" \ +ENV APP_VERSION="23.3.1" \ BITNAMI_APP_NAME="clickhouse" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/clickhouse/bin:$PATH" \ clickhouseCTL_API="3" diff --git a/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index a24b370d2ab4..030ddddccef3 100644 --- a/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "23.2.4-1" + "version": "23.3.1-0" }, "gosu": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-3" + "version": "1.16.0-5" } } \ No newline at end of file diff --git a/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 6fcb304d34cc..d70cf0779ec8 100644 --- a/bitnami/clickhouse/23/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/clickhouse/23/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/clickhouse/23/debian-11/tags-info.yaml b/bitnami/clickhouse/23/debian-11/tags-info.yaml index 47bf1f124d1b..1a5b0493fa72 100644 --- a/bitnami/clickhouse/23/debian-11/tags-info.yaml +++ b/bitnami/clickhouse/23/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "23" - 23-debian-11 -- 23.2.4 +- 23.3.1 - latest