diff --git a/bitnami/chartmuseum/0/debian-10/Dockerfile b/bitnami/chartmuseum/0/debian-10/Dockerfile index e13930f3bc83..57fae2fd9121 100644 --- a/bitnami/chartmuseum/0/debian-10/Dockerfile +++ b/bitnami/chartmuseum/0/debian-10/Dockerfile @@ -16,7 +16,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/chartmuseum/postunpack.sh ENV BITNAMI_APP_NAME="chartmuseum" \ - BITNAMI_IMAGE_VERSION="0.13.1-debian-10-r23" \ + BITNAMI_IMAGE_VERSION="0.13.1-debian-10-r24" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/chartmuseum/bin:$PATH" USER 1001 diff --git a/bitnami/chartmuseum/0/debian-10/docker-compose.yml b/bitnami/chartmuseum/0/debian-10/docker-compose.yml index 867e31320568..58f9f879e2fa 100644 --- a/bitnami/chartmuseum/0/debian-10/docker-compose.yml +++ b/bitnami/chartmuseum/0/debian-10/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: chartmuseum: - image: docker.io/bitnami/chartmuseum:0-debian-10 + image: docker.io/bitnami/chartmuseum:0 ports: - '8080:8080' volumes: diff --git a/bitnami/chartmuseum/0/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/chartmuseum/0/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh index 60ec4cbfc32a..cfc824f5ec83 100644 --- a/bitnami/chartmuseum/0/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/chartmuseum/0/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -106,5 +106,5 @@ indent() { for ((i = 0; i < num; i++)); do indent_unit="${indent_unit}${char}" done - echo "$string" | sed "s/^/${indent_unit}/" + echo "${string//^/${indent_unit}}" } diff --git a/bitnami/chartmuseum/0/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/chartmuseum/0/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh index 66d4f457bdd2..f3bc7568bfa5 100644 --- a/bitnami/chartmuseum/0/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/chartmuseum/0/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -9,7 +9,7 @@ # Functions ######################## -# Gets semantic version +# Gets semantic version # Arguments: # $1 - version: string to extract major.minor.patch # $2 - section: 1 to extract major, 2 to extract minor, 3 to extract patch @@ -38,7 +38,7 @@ get_sematic_version () { done local number_regex='^[0-9]+$' - if [[ "$section" =~ $number_regex ]] && (( $section > 0 )) && (( $section <= 3 )); then + if [[ "$section" =~ $number_regex ]] && (( section > 0 )) && (( section <= 3 )); then echo "${version_sections[$section]}" return else diff --git a/bitnami/chartmuseum/0/debian-10/rootfs/opt/bitnami/scripts/chartmuseum/entrypoint.sh b/bitnami/chartmuseum/0/debian-10/rootfs/opt/bitnami/scripts/chartmuseum/entrypoint.sh index 51904d8292df..d360390c7c22 100755 --- a/bitnami/chartmuseum/0/debian-10/rootfs/opt/bitnami/scripts/chartmuseum/entrypoint.sh +++ b/bitnami/chartmuseum/0/debian-10/rootfs/opt/bitnami/scripts/chartmuseum/entrypoint.sh @@ -1,10 +1,11 @@ #!/bin/bash +# shellcheck disable=SC1091 + set -o errexit set -o nounset set -o pipefail #set -o xtrace -# shellcheck disable=SC1091 # Load libraries . /opt/bitnami/scripts/libbitnami.sh diff --git a/bitnami/chartmuseum/0/debian-10/rootfs/opt/bitnami/scripts/chartmuseum/setup.sh b/bitnami/chartmuseum/0/debian-10/rootfs/opt/bitnami/scripts/chartmuseum/setup.sh index 92abf7ee7a10..dbb790fe96e2 100755 --- a/bitnami/chartmuseum/0/debian-10/rootfs/opt/bitnami/scripts/chartmuseum/setup.sh +++ b/bitnami/chartmuseum/0/debian-10/rootfs/opt/bitnami/scripts/chartmuseum/setup.sh @@ -29,7 +29,7 @@ chart_museum_validate() { warn "No storage type provided, a local storage will be used" fi - if [[ ! -z "${TLS_CERT:-}" ]] && [[ ! -z "${TLS_KEY:-}" ]]; then + if [[ -n "${TLS_CERT:-}" ]] && [[ -n "${TLS_KEY:-}" ]]; then if [[ ! -f "$TLS_CERT" ]]; then print_validation_error "The TLS certificate file in the specified path ${TLS_CERT} does not exist" || exit 1 fi @@ -37,7 +37,7 @@ chart_museum_validate() { if [[ ! -f "$TLS_KEY" ]]; then print_validation_error "The TLS private key file in the specified path ${TLS_KEY} does not exist" || exit 1 fi - elif [[ ! -z "${TLS_CERT:-}" ]] || [[ ! -z "${TLS_KEY:-}" ]]; then + elif [[ -n "${TLS_CERT:-}" ]] || [[ -n "${TLS_KEY:-}" ]]; then print_validation_error "Both TLS_CERT and TLS_KEY env variables must be set to enable TLS" || exit 1 else warn "No certificates provided, an insecure connection will be used" diff --git a/bitnami/chartmuseum/README.md b/bitnami/chartmuseum/README.md index 60a0277e291d..59d62f8a0f44 100644 --- a/bitnami/chartmuseum/README.md +++ b/bitnami/chartmuseum/README.md @@ -30,7 +30,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/). -* [`0`, `0-debian-10`, `0.13.1`, `0.13.1-debian-10-r23`, `latest` (0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-chartmuseum/blob/0.13.1-debian-10-r23/0/debian-10/Dockerfile) +* [`0`, `0-debian-10`, `0.13.1`, `0.13.1-debian-10-r24`, `latest` (0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-chartmuseum/blob/0.13.1-debian-10-r24/0/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/chartmuseum GitHub repo](https://github.com/bitnami/bitnami-docker-chartmuseum). diff --git a/bitnami/chartmuseum/docker-compose.yml b/bitnami/chartmuseum/docker-compose.yml index 867e31320568..58f9f879e2fa 100644 --- a/bitnami/chartmuseum/docker-compose.yml +++ b/bitnami/chartmuseum/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: chartmuseum: - image: docker.io/bitnami/chartmuseum:0-debian-10 + image: docker.io/bitnami/chartmuseum:0 ports: - '8080:8080' volumes: