From f427c8d8329f0126668b16125379f035cfe885e3 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 23 Sep 2022 22:28:58 +0200 Subject: [PATCH] [bitnami/spring-cloud-skipper-shell] Release 2.8.6-debian-11-r3 (#7714) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- .../2/debian-11/Dockerfile | 12 +---- .../scripts/locales/add-extra-locales.sh | 44 ------------------- bitnami/spring-cloud-skipper-shell/README.md | 2 +- 3 files changed, 3 insertions(+), 55 deletions(-) delete mode 100755 bitnami/spring-cloud-skipper-shell/2/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh diff --git a/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile b/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile index 6b7613bdfb5d..1e7571bb582f 100644 --- a/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile +++ b/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile @@ -4,7 +4,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="2.8.6-debian-11-r2" \ + org.opencontainers.image.ref.name="2.8.6-debian-11-r3" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/spring-cloud-skipper-shell" \ org.opencontainers.image.title="spring-cloud-skipper-shell" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -18,7 +18,7 @@ ENV HOME="/" \ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl gzip libc6 libgcc-s1 locales procps tar +RUN install_packages ca-certificates curl libc6 libgcc-s1 procps RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ if [ ! -f java-1.8.345-2-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ curl -SsLf https://downloads.bitnami.com/files/stacksmith/java-1.8.345-2-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ @@ -38,18 +38,10 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /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_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen RUN touch /opt/bitnami/spring-cloud-skipper-shell/spring-cloud-skipper-shell.log && chmod -R g+rwX /opt/bitnami/spring-cloud-skipper-shell -COPY rootfs / -RUN /opt/bitnami/scripts/locales/add-extra-locales.sh ENV APP_VERSION="2.8.6" \ BITNAMI_APP_NAME="spring-cloud-skipper-shell" \ - LANG="en_US.UTF-8" \ - LANGUAGE="en_US:en" \ PATH="/opt/bitnami/java/bin:$PATH" WORKDIR /opt/bitnami/spring-cloud-skipper-shell diff --git a/bitnami/spring-cloud-skipper-shell/2/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh b/bitnami/spring-cloud-skipper-shell/2/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh deleted file mode 100755 index de3120bd8ec0..000000000000 --- a/bitnami/spring-cloud-skipper-shell/2/debian-11/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/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/spring-cloud-skipper-shell/README.md b/bitnami/spring-cloud-skipper-shell/README.md index bf32b0d67437..7955a194c08e 100644 --- a/bitnami/spring-cloud-skipper-shell/README.md +++ b/bitnami/spring-cloud-skipper-shell/README.md @@ -28,7 +28,7 @@ $ docker run --name spring-cloud-skipper-shell bitnami/spring-cloud-skipper-shel 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/). -* [`2`, `2-debian-11`, `2.8.6`, `2.8.6-debian-11-r2`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile) +* [`2`, `2-debian-11`, `2.8.6`, `2.8.6-debian-11-r3`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/spring-cloud-skipper-shell/2/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).