From 7a70aeb99cadc22dc40e9d12c41eb5ba37aea96f Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 6 Jun 2022 11:09:04 +0000 Subject: [PATCH] 5.8.4-debian-11-r0 release --- .../5/debian-11/Dockerfile | 39 ++++++++++++++++ .../5/debian-11/docker-compose.yml | 4 ++ .../opt/bitnami/.bitnami_components.json | 16 +++++++ .../opt/bitnami/licenses/licenses.txt | 3 ++ .../prebuildfs/usr/sbin/install_packages | 24 ++++++++++ .../scripts/locales/add-extra-locales.sh | 44 +++++++++++++++++++ bitnami/elasticsearch-curator/README.md | 4 +- 7 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 bitnami/elasticsearch-curator/5/debian-11/Dockerfile create mode 100644 bitnami/elasticsearch-curator/5/debian-11/docker-compose.yml create mode 100644 bitnami/elasticsearch-curator/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json create mode 100644 bitnami/elasticsearch-curator/5/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt create mode 100755 bitnami/elasticsearch-curator/5/debian-11/prebuildfs/usr/sbin/install_packages create mode 100755 bitnami/elasticsearch-curator/5/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh diff --git a/bitnami/elasticsearch-curator/5/debian-11/Dockerfile b/bitnami/elasticsearch-curator/5/debian-11/Dockerfile new file mode 100644 index 000000000000..d5cbed5525d3 --- /dev/null +++ b/bitnami/elasticsearch-curator/5/debian-11/Dockerfile @@ -0,0 +1,39 @@ +FROM docker.io/bitnami/minideb:bullseye +LABEL maintainer "Bitnami " + +ENV HOME="/" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-11" \ + OS_NAME="linux" + +COPY prebuildfs / +# Install required system packages and dependencies +RUN install_packages ca-certificates curl gzip libbz2-1.0 libc6 libcom-err2 libcrypt1 libffi7 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl1.1 libtinfo6 libtirpc3 locales procps tar wget zlib1g +RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/python-3.9.13-0-linux-amd64-debian-11.tar.gz && \ + echo "30a95e9a200ac61754319a6ef764709a3c2e08f6fe21433bf935038f7308a7fb /tmp/bitnami/pkg/cache/python-3.9.13-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf /tmp/bitnami/pkg/cache/python-3.9.13-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ + rm -rf /tmp/bitnami/pkg/cache/python-3.9.13-0-linux-amd64-debian-11.tar.gz +RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/elasticsearch-curator-5.8.4-0-linux-amd64-debian-11.tar.gz && \ + echo "f2ff273861ddd249dda1cdde4f5caed15ed47cfb445dafa51e4d084775385f73 /tmp/bitnami/pkg/cache/elasticsearch-curator-5.8.4-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ + tar -zxf /tmp/bitnami/pkg/cache/elasticsearch-curator-5.8.4-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ + rm -rf /tmp/bitnami/pkg/cache/elasticsearch-curator-5.8.4-0-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 +RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 +RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \ + DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales +RUN echo 'en_GB.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen +RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen + +COPY rootfs / +RUN /opt/bitnami/scripts/locales/add-extra-locales.sh +ENV APP_VERSION="5.8.4" \ + BITNAMI_APP_NAME="elasticsearch-curator" \ + LANG="en_US.UTF-8" \ + LANGUAGE="en_US:en" \ + PATH="/opt/bitnami/python/bin:/opt/bitnami/elasticsearch-curator/bin:$PATH" + +USER 1001 +ENTRYPOINT [ "curator" ] +CMD [ "--help" ] diff --git a/bitnami/elasticsearch-curator/5/debian-11/docker-compose.yml b/bitnami/elasticsearch-curator/5/debian-11/docker-compose.yml new file mode 100644 index 000000000000..d92a67e8dca4 --- /dev/null +++ b/bitnami/elasticsearch-curator/5/debian-11/docker-compose.yml @@ -0,0 +1,4 @@ +version: '2' +services: + elasticsearch-curator: + image: docker.io/bitnami/elasticsearch-curator:5 diff --git a/bitnami/elasticsearch-curator/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/elasticsearch-curator/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json new file mode 100644 index 000000000000..c1bb468c75d8 --- /dev/null +++ b/bitnami/elasticsearch-curator/5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -0,0 +1,16 @@ +{ + "elasticsearch-curator": { + "arch": "amd64", + "digest": "f2ff273861ddd249dda1cdde4f5caed15ed47cfb445dafa51e4d084775385f73", + "distro": "debian-11", + "type": "NAMI", + "version": "5.8.4-0" + }, + "python": { + "arch": "amd64", + "digest": "30a95e9a200ac61754319a6ef764709a3c2e08f6fe21433bf935038f7308a7fb", + "distro": "debian-11", + "type": "NAMI", + "version": "3.9.13-0" + } +} \ No newline at end of file diff --git a/bitnami/elasticsearch-curator/5/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/elasticsearch-curator/5/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 000000000000..c76ba31f3b8a --- /dev/null +++ b/bitnami/elasticsearch-curator/5/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -0,0 +1,3 @@ +Bitnami containers ship with software bundles. You can find the licenses under: +/opt/bitnami/nami/COPYING +/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/elasticsearch-curator/5/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/elasticsearch-curator/5/debian-11/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/elasticsearch-curator/5/debian-11/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,24 @@ +#!/bin/sh +set -e +set -u +export DEBIAN_FRONTEND=noninteractive +n=0 +max=2 +until [ $n -gt $max ]; do + set +e + ( + apt-get update -qq && + apt-get install -y --no-install-recommends "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +rm -r /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/elasticsearch-curator/5/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh b/bitnami/elasticsearch-curator/5/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh new file mode 100755 index 000000000000..de3120bd8ec0 --- /dev/null +++ b/bitnami/elasticsearch-curator/5/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh @@ -0,0 +1,44 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purpose + +# Defaults +WITH_ALL_LOCALES="${WITH_ALL_LOCALES:-no}" +EXTRA_LOCALES="${EXTRA_LOCALES:-}" + +# Constants +LOCALES_FILE="/etc/locale.gen" +SUPPORTED_LOCALES_FILE="/usr/share/i18n/SUPPORTED" + +# Helper function for enabling locale only when it was not added before +enable_locale() { + local -r locale="${1:?missing locale}" + if ! grep -q -E "^${locale}$" "$SUPPORTED_LOCALES_FILE"; then + echo "Locale ${locale} is not supported in this system" + return 1 + fi + if ! grep -q -E "^${locale}" "$LOCALES_FILE"; then + echo "$locale" >> "$LOCALES_FILE" + else + echo "Locale ${locale} is already enabled" + fi +} + +if [[ "$WITH_ALL_LOCALES" =~ ^(yes|true|1)$ ]]; then + echo "Enabling all locales" + cp "$SUPPORTED_LOCALES_FILE" "$LOCALES_FILE" +else + # shellcheck disable=SC2001 + LOCALES_TO_ADD="$(sed 's/[,;]\s*/\n/g' <<< "$EXTRA_LOCALES")" + while [[ -n "$LOCALES_TO_ADD" ]] && read -r locale; do + echo "Enabling locale ${locale}" + enable_locale "$locale" + done <<< "$LOCALES_TO_ADD" +fi + +locale-gen diff --git a/bitnami/elasticsearch-curator/README.md b/bitnami/elasticsearch-curator/README.md index c8afb9771f2b..345c99b504bd 100644 --- a/bitnami/elasticsearch-curator/README.md +++ b/bitnami/elasticsearch-curator/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/). -* [`5`, `5-debian-10`, `5.8.4`, `5.8.4-debian-10-r364`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch-curator/blob/5.8.4-debian-10-r364/5/debian-10/Dockerfile) +* [`5`, `5-debian-11`, `5.8.4`, `5.8.4-debian-11-r0`, `latest` (5/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-elasticsearch-curator/blob/5.8.4-debian-11-r0/5/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/elasticsearch-curator GitHub repo](https://github.com/bitnami/bitnami-docker-elasticsearch-curator). @@ -64,7 +64,7 @@ $ docker pull bitnami/elasticsearch-curator:[TAG] If you wish, you can also build the image yourself. ```console -$ docker build -t bitnami/elasticsearch-curator:latest 'https://github.com/bitnami/bitnami-docker-elasticsearch-curator.git#master:5/debian-10' +$ docker build -t bitnami/elasticsearch-curator:latest 'https://github.com/bitnami/bitnami-docker-elasticsearch-curator.git#master:5/debian-11' ``` ## Connecting to other containers