From f01c6877f9cec6f56f8a049ac3560de00419e112 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 2 Sep 2022 04:47:05 +0200 Subject: [PATCH] [bitnami/zookeeper] Release 3.8.0-debian-11-r32 (#4933) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/zookeeper/3.8/debian-11/Dockerfile | 34 ++++++++-- .../opt/bitnami/scripts/libcomponent.sh | 65 ------------------- .../opt/bitnami/scripts/libzookeeper.sh | 7 +- bitnami/zookeeper/README.md | 2 +- 4 files changed, 36 insertions(+), 72 deletions(-) delete mode 100644 bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh diff --git a/bitnami/zookeeper/3.8/debian-11/Dockerfile b/bitnami/zookeeper/3.8/debian-11/Dockerfile index e1b5571ec4f3..c3c5d346d93b 100644 --- a/bitnami/zookeeper/3.8/debian-11/Dockerfile +++ b/bitnami/zookeeper/3.8/debian-11/Dockerfile @@ -7,7 +7,7 @@ ENV HOME="/" \ LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="3.8.0-debian-11-r31" \ + org.opencontainers.image.ref.name="3.8.0-debian-11-r32" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/zookeeper" \ org.opencontainers.image.title="zookeeper" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -17,10 +17,34 @@ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libc6 netcat procps tar xmlstarlet zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wait-for-port" "1.0.3-154" --checksum 74a09c2208af7316f32ee3ee8479d70b20ad54f1a989e84b6417e23c1f07c147 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "11.0.15-1-3" --checksum 7214b8ab81c9d919f87f027590ca80c198f65fe50c5e2886d8e5e20691aee8d7 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-154" --checksum e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "zookeeper" "3.8.0-155" --checksum 9f98a0f908c6c8611a333d903d3c01fe874fb955916981fbc513e23ca8706eb9 +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f wait-for-port-1.0.3-154-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/wait-for-port-1.0.3-154-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "74a09c2208af7316f32ee3ee8479d70b20ad54f1a989e84b6417e23c1f07c147 wait-for-port-1.0.3-154-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf wait-for-port-1.0.3-154-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf wait-for-port-1.0.3-154-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f java-11.0.15-1-3-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-11.0.15-1-3-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "7214b8ab81c9d919f87f027590ca80c198f65fe50c5e2886d8e5e20691aee8d7 java-11.0.15-1-3-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf java-11.0.15-1-3-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf java-11.0.15-1-3-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f gosu-1.14.0-154-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab gosu-1.14.0-154-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf gosu-1.14.0-154-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f zookeeper-3.8.0-155-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/zookeeper-3.8.0-155-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "9f98a0f908c6c8611a333d903d3c01fe874fb955916981fbc513e23ca8706eb9 zookeeper-3.8.0-155-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf zookeeper-3.8.0-155-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf zookeeper-3.8.0-155-linux-amd64-debian-11.tar.gz RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami diff --git a/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh deleted file mode 100644 index a7b60696daa6..000000000000 --- a/bitnami/zookeeper/3.8/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# -# Library for managing Bitnami components - -# Constants -CACHE_ROOT="/tmp/bitnami/pkg/cache" -DOWNLOAD_URL="https://downloads.bitnami.com/files/stacksmith" - -# Functions - -######################## -# Download and unpack a Bitnami package -# Globals: -# OS_NAME -# OS_ARCH -# OS_FLAVOUR -# Arguments: -# $1 - component's name -# $2 - component's version -# Returns: -# None -######################### -component_unpack() { - local name="${1:?name is required}" - local version="${2:?version is required}" - local base_name="${name}-${version}-${OS_NAME}-${OS_ARCH}-${OS_FLAVOUR}" - local package_sha256="" - local directory="/opt/bitnami" - - # Validate arguments - shift 2 - while [ "$#" -gt 0 ]; do - case "$1" in - -c|--checksum) - shift - package_sha256="${1:?missing package checksum}" - ;; - *) - echo "Invalid command line flag $1" >&2 - return 1 - ;; - esac - shift - done - - echo "Downloading $base_name package" - if [ -f "${CACHE_ROOT}/${base_name}.tar.gz" ]; then - echo "${CACHE_ROOT}/${base_name}.tar.gz already exists, skipping download." - cp "${CACHE_ROOT}/${base_name}.tar.gz" . - rm "${CACHE_ROOT}/${base_name}.tar.gz" - if [ -f "${CACHE_ROOT}/${base_name}.tar.gz.sha256" ]; then - echo "Using the local sha256 from ${CACHE_ROOT}/${base_name}.tar.gz.sha256" - package_sha256="$(< "${CACHE_ROOT}/${base_name}.tar.gz.sha256")" - rm "${CACHE_ROOT}/${base_name}.tar.gz.sha256" - fi - else - curl --remote-name --silent --show-error --fail "${DOWNLOAD_URL}/${base_name}.tar.gz" - fi - if [ -n "$package_sha256" ]; then - echo "Verifying package integrity" - echo "$package_sha256 ${base_name}.tar.gz" | sha256sum --check - || return "$?" - fi - tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 || return "$?" - rm "${base_name}.tar.gz" -} diff --git a/bitnami/zookeeper/3.8/debian-11/rootfs/opt/bitnami/scripts/libzookeeper.sh b/bitnami/zookeeper/3.8/debian-11/rootfs/opt/bitnami/scripts/libzookeeper.sh index 1da73827b049..b64814da76d8 100644 --- a/bitnami/zookeeper/3.8/debian-11/rootfs/opt/bitnami/scripts/libzookeeper.sh +++ b/bitnami/zookeeper/3.8/debian-11/rootfs/opt/bitnami/scripts/libzookeeper.sh @@ -197,7 +197,12 @@ zookeeper_generate_conf() { zookeeper_conf_set "$ZOO_CONF_FILE" 4lw.commands.whitelist "$ZOO_4LW_COMMANDS_WHITELIST" zookeeper_conf_set "$ZOO_CONF_FILE" maxSessionTimeout "$ZOO_MAX_SESSION_TIMEOUT" # Set log level - xmlstarlet edit -L -u "/configuration/property[@name='zookeeper.console.threshold']/@value" -v "$ZOO_LOG_LEVEL" "${ZOO_CONF_DIR}/logback.xml" + if [ -f "${ZOO_CONF_DIR}/logback.xml" ]; then + # Zookeeper 3.8+ + xmlstarlet edit -L -u "/configuration/property[@name='zookeeper.console.threshold']/@value" -v "$ZOO_LOG_LEVEL" "${ZOO_CONF_DIR}/logback.xml" + else + zookeeper_conf_set "${ZOO_CONF_DIR}/log4j.properties" zookeeper.console.threshold "$ZOO_LOG_LEVEL" + fi # Admin web server https://zookeeper.apache.org/doc/r3.5.7/zookeeperAdmin.html#sc_adminserver zookeeper_conf_set "$ZOO_CONF_FILE" admin.serverPort "$ZOO_ADMIN_SERVER_PORT_NUMBER" zookeeper_conf_set "$ZOO_CONF_FILE" admin.enableServer "$(is_boolean_yes "$ZOO_ENABLE_ADMIN_SERVER" && echo "true" || echo "false")" diff --git a/bitnami/zookeeper/README.md b/bitnami/zookeeper/README.md index 5afe53ef100f..67ccddbba491 100644 --- a/bitnami/zookeeper/README.md +++ b/bitnami/zookeeper/README.md @@ -50,7 +50,7 @@ Non-root container images add an extra layer of security and are generally recom Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`3.8`, `3.8-debian-11`, `3.8.0`, `3.8.0-debian-11-r31`, `latest` (3.8/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/zookeeper/3.8/debian-11/Dockerfile) +* [`3.8`, `3.8-debian-11`, `3.8.0`, `3.8.0-debian-11-r32`, `latest` (3.8/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/zookeeper/3.8/debian-11/Dockerfile) * [`3.7`, `3.7-debian-11`, `3.7.1`, `3.7.1-debian-11-r35` (3.7/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/zookeeper/3.7/debian-11/Dockerfile) * [`3.6`, `3.6-debian-11`, `3.6.3`, `3.6.3-debian-11-r35` (3.6/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/zookeeper/3.6/debian-11/Dockerfile)