From e44767846f6881821cc4c1d47c07320f71da4509 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Hernandez Date: Wed, 22 Jun 2022 10:53:57 +0000 Subject: [PATCH] Remove debian-10 directory Signed-off-by: Carlos Rodriguez Hernandez --- .../2/debian-10/Dockerfile | 40 ----------------- .../2/debian-10/docker-compose.yml | 5 --- .../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 ------------------- 6 files changed, 132 deletions(-) delete mode 100644 bitnami/spring-cloud-dataflow-shell/2/debian-10/Dockerfile delete mode 100644 bitnami/spring-cloud-dataflow-shell/2/debian-10/docker-compose.yml delete mode 100644 bitnami/spring-cloud-dataflow-shell/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json delete mode 100644 bitnami/spring-cloud-dataflow-shell/2/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/spring-cloud-dataflow-shell/2/debian-10/prebuildfs/usr/sbin/install_packages delete mode 100755 bitnami/spring-cloud-dataflow-shell/2/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh diff --git a/bitnami/spring-cloud-dataflow-shell/2/debian-10/Dockerfile b/bitnami/spring-cloud-dataflow-shell/2/debian-10/Dockerfile deleted file mode 100644 index 7447f90e95a5..000000000000 --- a/bitnami/spring-cloud-dataflow-shell/2/debian-10/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM docker.io/bitnami/minideb:buster -LABEL maintainer "Bitnami " - -ENV HOME="/" \ - OS_ARCH="amd64" \ - OS_FLAVOUR="debian-10" \ - OS_NAME="linux" - -COPY prebuildfs / -# Install required system packages and dependencies -RUN install_packages ca-certificates curl gzip libc6 libgcc1 locales procps tar wget -RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/java-1.8.333-0-linux-amd64-debian-10.tar.gz && \ - echo "4b5fa59710327cb409d6f469335a71ba1ce1ad2068e30b2aa35b9cbc101bcd6f /tmp/bitnami/pkg/cache/java-1.8.333-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ - tar -zxf /tmp/bitnami/pkg/cache/java-1.8.333-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ - rm -rf /tmp/bitnami/pkg/cache/java-1.8.333-0-linux-amd64-debian-10.tar.gz -RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/spring-cloud-dataflow-shell-2.9.4-0-linux-amd64-debian-10.tar.gz && \ - echo "3c9c88c0bc22079cf531ea380c7883581efda25a6a402849a63c032dc45543bc /tmp/bitnami/pkg/cache/spring-cloud-dataflow-shell-2.9.4-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ - tar -zxf /tmp/bitnami/pkg/cache/spring-cloud-dataflow-shell-2.9.4-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ - rm -rf /tmp/bitnami/pkg/cache/spring-cloud-dataflow-shell-2.9.4-0-linux-amd64-debian-10.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_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen -RUN touch /opt/bitnami/spring-cloud-dataflow-shell/spring-cloud-dataflow-shell.log && chmod -R g+rwX /opt/bitnami/spring-cloud-dataflow-shell - -COPY rootfs / -RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -ENV APP_VERSION="2.9.4" \ - BITNAMI_APP_NAME="spring-cloud-dataflow-shell" \ - LANG="en_US.UTF-8" \ - LANGUAGE="en_US:en" \ - PATH="/opt/bitnami/java/bin:$PATH" - -WORKDIR /opt/bitnami/spring-cloud-dataflow-shell -USER 1001 -ENTRYPOINT [ "/opt/bitnami/java/bin/java", "-jar", "/opt/bitnami/spring-cloud-dataflow-shell/spring-cloud-dataflow-shell.jar" ] -CMD [ "--help" ] diff --git a/bitnami/spring-cloud-dataflow-shell/2/debian-10/docker-compose.yml b/bitnami/spring-cloud-dataflow-shell/2/debian-10/docker-compose.yml deleted file mode 100644 index d1c779d69179..000000000000 --- a/bitnami/spring-cloud-dataflow-shell/2/debian-10/docker-compose.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: '2' - -services: - spring-cloud-dataflow-shell: - image: docker.io/bitnami/spring-cloud-dataflow-shell:2 diff --git a/bitnami/spring-cloud-dataflow-shell/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spring-cloud-dataflow-shell/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index 73a9d0654bde..000000000000 --- a/bitnami/spring-cloud-dataflow-shell/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "java": { - "arch": "amd64", - "digest": "4b5fa59710327cb409d6f469335a71ba1ce1ad2068e30b2aa35b9cbc101bcd6f", - "distro": "debian-10", - "type": "NAMI", - "version": "1.8.333-0" - }, - "spring-cloud-dataflow-shell": { - "arch": "amd64", - "digest": "3c9c88c0bc22079cf531ea380c7883581efda25a6a402849a63c032dc45543bc", - "distro": "debian-10", - "type": "NAMI", - "version": "2.9.4-0" - } -} \ No newline at end of file diff --git a/bitnami/spring-cloud-dataflow-shell/2/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/spring-cloud-dataflow-shell/2/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index c76ba31f3b8a..000000000000 --- a/bitnami/spring-cloud-dataflow-shell/2/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt +++ /dev/null @@ -1,3 +0,0 @@ -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/spring-cloud-dataflow-shell/2/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/spring-cloud-dataflow-shell/2/debian-10/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index c9577647443b..000000000000 --- a/bitnami/spring-cloud-dataflow-shell/2/debian-10/prebuildfs/usr/sbin/install_packages +++ /dev/null @@ -1,24 +0,0 @@ -#!/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/spring-cloud-dataflow-shell/2/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh b/bitnami/spring-cloud-dataflow-shell/2/debian-10/rootfs/opt/bitnami/scripts/locales/add-extra-locales.sh deleted file mode 100755 index de3120bd8ec0..000000000000 --- a/bitnami/spring-cloud-dataflow-shell/2/debian-10/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