From c5bbbd363363aec7d7affec75d17dc1de02d0238 Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Thu, 11 Aug 2022 14:58:12 +0200 Subject: [PATCH] [bitnami/dotnet] Remove branch 6.0 files (renamed as 6) (#2734) Signed-off-by: Miguel Ruiz Signed-off-by: Miguel Ruiz --- bitnami/dotnet/6.0/debian-11/Dockerfile | 38 ------ .../dotnet/6.0/debian-11/docker-compose.yml | 10 -- .../opt/bitnami/.bitnami_components.json | 9 -- .../prebuildfs/opt/bitnami/base/functions | 120 ------------------ .../prebuildfs/opt/bitnami/base/helpers | 40 ------ .../opt/bitnami/licenses/licenses.txt | 3 - .../prebuildfs/usr/sbin/install_packages | 24 ---- .../opt/bitnami/scripts/dotnet/entrypoint.sh | 10 -- .../opt/bitnami/scripts/dotnet/postunpack.sh | 12 -- 9 files changed, 266 deletions(-) delete mode 100644 bitnami/dotnet/6.0/debian-11/Dockerfile delete mode 100644 bitnami/dotnet/6.0/debian-11/docker-compose.yml delete mode 100644 bitnami/dotnet/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json delete mode 100644 bitnami/dotnet/6.0/debian-11/prebuildfs/opt/bitnami/base/functions delete mode 100644 bitnami/dotnet/6.0/debian-11/prebuildfs/opt/bitnami/base/helpers delete mode 100644 bitnami/dotnet/6.0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/dotnet/6.0/debian-11/prebuildfs/usr/sbin/install_packages delete mode 100755 bitnami/dotnet/6.0/debian-11/rootfs/opt/bitnami/scripts/dotnet/entrypoint.sh delete mode 100755 bitnami/dotnet/6.0/debian-11/rootfs/opt/bitnami/scripts/dotnet/postunpack.sh diff --git a/bitnami/dotnet/6.0/debian-11/Dockerfile b/bitnami/dotnet/6.0/debian-11/Dockerfile deleted file mode 100644 index 2e258ac8846c..000000000000 --- a/bitnami/dotnet/6.0/debian-11/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -FROM docker.io/bitnami/minideb:bullseye -ENV HOME="/app" \ - OS_ARCH="amd64" \ - OS_FLAVOUR="debian-11" \ - OS_NAME="linux" - -LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ - org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/dotnet" \ - org.opencontainers.image.title="dotnet" \ - org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="6.0.8" - -COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# Install required system packages and dependencies -RUN install_packages build-essential ca-certificates curl git gzip libc6 libcap2-bin libgcc-s1 libicu-dev liblttng-ust-dev libsqlite3-dev libssl-dev libstdc++6 pkg-config procps tar unzip wget zlib1g -RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/dotnet-6.0.8-0-linux-amd64-debian-11.tar.gz && \ - echo "5b544c3e4187eb0d4cc1ce58247f4e31f15a953e8811c93fee46a0793dea59da /tmp/bitnami/pkg/cache/dotnet-6.0.8-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \ - tar -zxf /tmp/bitnami/pkg/cache/dotnet-6.0.8-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ - rm -rf /tmp/bitnami/pkg/cache/dotnet-6.0.8-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 sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ - sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS 0/' /etc/login.defs && \ - sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password - -COPY rootfs / -RUN /opt/bitnami/scripts/dotnet/postunpack.sh -ENV APP_VERSION="6.0.8" \ - BITNAMI_APP_NAME="dotnet" \ - DOTNET_CLI_HOME="/app" \ - DOTNET_ROOT="/opt/bitnami/dotnet/bin" \ - PATH="/opt/bitnami/dotnet/bin:$PATH" - -WORKDIR /app -ENTRYPOINT [ "/opt/bitnami/scripts/dotnet/entrypoint.sh" ] -CMD [ "/bin/bash" ] diff --git a/bitnami/dotnet/6.0/debian-11/docker-compose.yml b/bitnami/dotnet/6.0/debian-11/docker-compose.yml deleted file mode 100644 index c29c58e4cf99..000000000000 --- a/bitnami/dotnet/6.0/debian-11/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: '2' -services: - dotnet: - image: docker.io/bitnami/dotnet:6.0 - command: ["tail", "-f", "/dev/null"] # To keep the container running - volumes: - - dotnet_data:/app -volumes: - dotnet_data: - driver: local diff --git a/bitnami/dotnet/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/dotnet/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index 6ca3d6b92866..000000000000 --- a/bitnami/dotnet/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dotnet": { - "arch": "amd64", - "digest": "5b544c3e4187eb0d4cc1ce58247f4e31f15a953e8811c93fee46a0793dea59da", - "distro": "debian-11", - "type": "NAMI", - "version": "6.0.8-0" - } -} \ No newline at end of file diff --git a/bitnami/dotnet/6.0/debian-11/prebuildfs/opt/bitnami/base/functions b/bitnami/dotnet/6.0/debian-11/prebuildfs/opt/bitnami/base/functions deleted file mode 100644 index 329de38f863a..000000000000 --- a/bitnami/dotnet/6.0/debian-11/prebuildfs/opt/bitnami/base/functions +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash - -[[ ${BASH_DEBUG:-false} = true ]] && set -x - -# Constants -MODULE="$(basename "$0")" -BITNAMI_PREFIX=/opt/bitnami - -# Color Palette -RESET='\033[0m' -BOLD='\033[1m' - -## Foreground -BLACK='\033[38;5;0m' -RED='\033[38;5;1m' -GREEN='\033[38;5;2m' -YELLOW='\033[38;5;3m' -BLUE='\033[38;5;4m' -MAGENTA='\033[38;5;5m' -CYAN='\033[38;5;6m' -WHITE='\033[38;5;7m' - -## Background -ON_BLACK='\033[48;5;0m' -ON_RED='\033[48;5;1m' -ON_GREEN='\033[48;5;2m' -ON_YELLOW='\033[48;5;3m' -ON_BLUE='\033[48;5;4m' -ON_MAGENTA='\033[48;5;5m' -ON_CYAN='\033[48;5;6m' -ON_WHITE='\033[48;5;7m' - -# Functions - -######################## -# Print to STDERR -# Arguments: -# Message to print -# Returns: -# None -######################### -stderr_print() { - printf "%b\\n" "${*}" >&2 -} - -######################## -# Log message -# Arguments: -# Message to log -# Returns: -# None -######################### -log() { - stderr_print "${NAMI_DEBUG:+${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")}${RESET}${*}" -} -######################## -# Log an 'info' message -# Arguments: -# Message to log -# Returns: -# None -######################### -info() { - log "${GREEN}INFO ${RESET} ==> ${*}" -} -######################## -# Log message -# Arguments: -# Message to log -# Returns: -# None -######################### -warn() { - log "${YELLOW}WARN ${RESET} ==> ${*}" -} -######################## -# Log an 'error' message -# Arguments: -# Message to log -# Returns: -# None -######################### -error() { - log "${RED}ERROR${RESET} ==> ${*}" -} -######################## -# Print the welcome page -# Globals: -# DISABLE_WELCOME_MESSAGE -# BITNAMI_APP_NAME -# Arguments: -# None -# Returns: -# None -######################### -print_welcome_page() { - if [[ -z "${DISABLE_WELCOME_MESSAGE:-}" ]]; then - if [[ -n "$BITNAMI_APP_NAME" ]]; then - print_image_welcome_page - fi - fi -} -######################## -# Print the welcome page for a Bitnami Docker image -# Globals: -# BITNAMI_APP_NAME -# Arguments: -# None -# Returns: -# None -######################### -print_image_welcome_page() { - local github_url="https://github.com/bitnami/containers" - - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" -} diff --git a/bitnami/dotnet/6.0/debian-11/prebuildfs/opt/bitnami/base/helpers b/bitnami/dotnet/6.0/debian-11/prebuildfs/opt/bitnami/base/helpers deleted file mode 100644 index 0ea003d94b0a..000000000000 --- a/bitnami/dotnet/6.0/debian-11/prebuildfs/opt/bitnami/base/helpers +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /opt/bitnami/base/functions - -######################## -# Helper function to initialize a single nami module -# Arguments: -# Module to initialize -# Returns: -# None -# Description: -# Initialize an unpacked nami module with the `nami initialize` command. -# Command arguments can be specified as function argumnts after the module name. -# `--log-level trace` flag is added to the command if `NAMI_DEBUG` env variable exists. -# The log level can be overridden using the `NAMI_LOG_LEVEL` env variable. -######################### -nami_initialize_one() { - local module="${1:?module not specified}" - if nami inspect $module | grep -q '"lifecycle": "unpacked"'; then - local inputs= - if [[ -f "/${module}-inputs.json" ]]; then - inputs="--inputs-file=/${module}-inputs.json" - fi - nami ${NAMI_DEBUG:+--log-level ${NAMI_LOG_LEVEL:-trace}} initialize $module $inputs "${@:2}" - fi -} - -######################## -# Helper function to initialize one or more nami modules -# Arguments: -# Module to initialize -# Returns: -# None -######################### -nami_initialize() { - local module="${1:?module not specified}" - for module in "${@}"; do - nami_initialize_one $module - done -} diff --git a/bitnami/dotnet/6.0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/dotnet/6.0/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index c76ba31f3b8a..000000000000 --- a/bitnami/dotnet/6.0/debian-11/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/dotnet/6.0/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/dotnet/6.0/debian-11/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index c9577647443b..000000000000 --- a/bitnami/dotnet/6.0/debian-11/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/dotnet/6.0/debian-11/rootfs/opt/bitnami/scripts/dotnet/entrypoint.sh b/bitnami/dotnet/6.0/debian-11/rootfs/opt/bitnami/scripts/dotnet/entrypoint.sh deleted file mode 100755 index a3debbb981db..000000000000 --- a/bitnami/dotnet/6.0/debian-11/rootfs/opt/bitnami/scripts/dotnet/entrypoint.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -e - -# shellcheck disable=SC1091 - -. /opt/bitnami/base/functions -. /opt/bitnami/base/helpers - -print_welcome_page - -exec "$@" diff --git a/bitnami/dotnet/6.0/debian-11/rootfs/opt/bitnami/scripts/dotnet/postunpack.sh b/bitnami/dotnet/6.0/debian-11/rootfs/opt/bitnami/scripts/dotnet/postunpack.sh deleted file mode 100755 index d962c4d05e3b..000000000000 --- a/bitnami/dotnet/6.0/debian-11/rootfs/opt/bitnami/scripts/dotnet/postunpack.sh +++ /dev/null @@ -1,12 +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 -mkdir /app -chmod g+rwx /app -ln -fs /usr/lib/libz.so.1 /lib64/libz.so -setcap CAP_NET_BIND_SERVICE=+eip /opt/bitnami/dotnet/bin/dotnet