From 95a94992cb26f4b1ef70e70c2f073840b4b4aed9 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 1 Sep 2022 22:54:14 +0200 Subject: [PATCH] [bitnami/spark] Release 3.3.0-debian-11-r23 (#4865) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/spark/3.3/debian-11/Dockerfile | 34 ++++++++-- .../opt/bitnami/.bitnami_components.json | 4 +- .../opt/bitnami/scripts/libcomponent.sh | 65 ------------------- bitnami/spark/README.md | 2 +- 4 files changed, 32 insertions(+), 73 deletions(-) delete mode 100644 bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh diff --git a/bitnami/spark/3.3/debian-11/Dockerfile b/bitnami/spark/3.3/debian-11/Dockerfile index d8e15c753e1e..a0fafd2a3549 100644 --- a/bitnami/spark/3.3/debian-11/Dockerfile +++ b/bitnami/spark/3.3/debian-11/Dockerfile @@ -8,7 +8,7 @@ ENV HOME="/" \ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="3.3.0-debian-11-r22" \ + org.opencontainers.image.ref.name="3.3.0-debian-11-r23" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/spark" \ org.opencontainers.image.title="spark" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -18,10 +18,34 @@ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libbz2-1.0 libc6 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 tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "python" "3.8.13-166" --checksum 9a5fba755f6c8d60eacc80f366f3fbaa57d003913e48c31ba337037bb69e37b3 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "1.8.345-2" --checksum b244bc8c1f972d20fac8019cf97fb05ce6cd8be2034ca11f52243c8bd96aaa23 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "spark" "3.3.0-6" --checksum 925637d989e826b023d708ac6369a5a2c573ab1169c292ee4c20aa9888174a9f -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-154" --checksum e36c3d90f4fbfbe989f40947fa7c8ab817f12fcf97d3aef893c753a20ce976ab +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f python-3.8.13-167-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/python-3.8.13-167-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "6e21552dc6c19b01247f3ec7bcd0401e6192519fe206e136e205ac6c3b842e7b python-3.8.13-167-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf python-3.8.13-167-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf python-3.8.13-167-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f java-1.8.345-2-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-1.8.345-2-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "b244bc8c1f972d20fac8019cf97fb05ce6cd8be2034ca11f52243c8bd96aaa23 java-1.8.345-2-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf java-1.8.345-2-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf java-1.8.345-2-linux-amd64-debian-11.tar.gz +RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ + if [ ! -f spark-3.3.0-6-linux-amd64-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/spark-3.3.0-6-linux-amd64-debian-11.tar.gz -O ; \ + fi && \ + echo "925637d989e826b023d708ac6369a5a2c573ab1169c292ee4c20aa9888174a9f spark-3.3.0-6-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf spark-3.3.0-6-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf spark-3.3.0-6-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 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/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index cc9a07707cb2..0238d614dc74 100644 --- a/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,10 +15,10 @@ }, "python": { "arch": "amd64", - "digest": "9a5fba755f6c8d60eacc80f366f3fbaa57d003913e48c31ba337037bb69e37b3", + "digest": "6e21552dc6c19b01247f3ec7bcd0401e6192519fe206e136e205ac6c3b842e7b", "distro": "debian-11", "type": "NAMI", - "version": "3.8.13-166" + "version": "3.8.13-167" }, "spark": { "arch": "amd64", diff --git a/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/spark/3.3/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh deleted file mode 100644 index a7b60696daa6..000000000000 --- a/bitnami/spark/3.3/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/spark/README.md b/bitnami/spark/README.md index 388698338e30..9270cbec69f5 100644 --- a/bitnami/spark/README.md +++ b/bitnami/spark/README.md @@ -43,7 +43,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.3`, `3.3-debian-11`, `3.3.0`, `3.3.0-debian-11-r22`, `latest` (3.3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spark/3.3/debian-11/Dockerfile) +* [`3.3`, `3.3-debian-11`, `3.3.0`, `3.3.0-debian-11-r23`, `latest` (3.3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spark/3.3/debian-11/Dockerfile) * [`3.2`, `3.2-debian-11`, `3.2.2`, `3.2.2-debian-11-r13` (3.2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spark/3.2/debian-11/Dockerfile) * [`3.1`, `3.1-debian-11`, `3.1.3`, `3.1.3-debian-11-r26` (3.1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spark/3.1/debian-11/Dockerfile)