From e123c05a421faa9d2d45d0abf121c3ac6c2c06f2 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Mon, 17 Oct 2022 14:05:36 +0200 Subject: [PATCH] [bitnami/kubeapps-dashboard] Release 2.6.0-debian-11-r0 (#10442) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/kubeapps-dashboard/2/debian-11/Dockerfile | 12 ++++++------ .../prebuildfs/opt/bitnami/.bitnami_components.json | 8 ++++---- .../prebuildfs/opt/bitnami/scripts/libos.sh | 4 ++-- .../kubeapps-dashboard/2/debian-11/tags-info.yaml | 2 +- bitnami/kubeapps-dashboard/README.md | 3 ++- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/bitnami/kubeapps-dashboard/2/debian-11/Dockerfile b/bitnami/kubeapps-dashboard/2/debian-11/Dockerfile index 44b039536a72..8439098fa5cb 100644 --- a/bitnami/kubeapps-dashboard/2/debian-11/Dockerfile +++ b/bitnami/kubeapps-dashboard/2/debian-11/Dockerfile @@ -4,11 +4,11 @@ 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.5.1-debian-11-r13" \ + org.opencontainers.image.ref.name="2.6.0-debian-11-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/kubeapps-dashboard" \ org.opencontainers.image.title="kubeapps-dashboard" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.5.1" + org.opencontainers.image.version="2.6.0" ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_FLAVOUR="debian-11" \ @@ -20,9 +20,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libcrypt1 libgeoip1 libpcre3 libssl1.1 procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "nginx-1.23.1-7-linux-${OS_ARCH}-debian-11" \ + "nginx-1.23.1-8-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.3-154-linux-${OS_ARCH}-debian-11" \ - "kubeapps-2.5.1-0-linux-${OS_ARCH}-debian-11" \ + "kubeapps-2.6.0-0-linux-${OS_ARCH}-debian-11" \ "gosu-1.14.0-155-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ @@ -32,7 +32,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ fi && \ sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf "${COMPONENT}.tar.gz{,sha256}" ; \ + rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives @@ -45,7 +45,7 @@ RUN rm -rf /app && \ mv /opt/bitnami/kubeapps/build /app RUN chmod -R g+rwX /opt/bitnami/nginx/conf RUN /opt/bitnami/scripts/nginx/postunpack.sh -ENV APP_VERSION="2.5.1" \ +ENV APP_VERSION="2.6.0" \ BITNAMI_APP_NAME="kubeapps-dashboard" \ NGINX_HTTPS_PORT_NUMBER="" \ NGINX_HTTP_PORT_NUMBER="" \ diff --git a/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 1dfa08ca1caa..62d5b51bd2a8 100644 --- a/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,17 +8,17 @@ }, "kubeapps": { "arch": "amd64", - "digest": "fc6ac831190db8abc953853936dda20f7186830f8ec17c8c9c6f8bed4414f8df", + "digest": "5257ca7a47bdd63bc55bde07ba3b3ed7261b5b7553578902ee69647f3c58ceaf", "distro": "debian-11", "type": "NAMI", - "version": "2.5.1-0" + "version": "2.6.0-0" }, "nginx": { "arch": "amd64", - "digest": "9f2408a47108ddb2d2adae8e6417eef7bdc6b00ef5dfae5ec191101048bf0100", + "digest": "9a8c4614980cb5a8a45f691ec7883332e6fa63f219d428cfb5e9dadd15ea1616", "distro": "debian-11", "type": "NAMI", - "version": "1.23.1-7" + "version": "1.23.1-8" }, "render-template": { "arch": "amd64", diff --git a/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 92530b32d94d..5e141d4ce3f1 100644 --- a/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/kubeapps-dashboard/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -519,7 +519,7 @@ get_machine_id() { get_disk_device_id() { local device_id="" if grep -q ^/dev /proc/mounts; then - device_id="$(grep -q ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)" + device_id="$(grep ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)" fi # If it could not be autodetected, fallback to /dev/sda1 as a default if [[ -z "$device_id" || ! -b "$device_id" ]]; then @@ -538,7 +538,7 @@ get_disk_device_id() { # Root disk ID ######################### get_root_disk_device_id() { - get_disk_device_id | sed 's/[0-9]\+$//' + get_disk_device_id | sed -E 's/p?[0-9]+$//' } ######################## diff --git a/bitnami/kubeapps-dashboard/2/debian-11/tags-info.yaml b/bitnami/kubeapps-dashboard/2/debian-11/tags-info.yaml index 2de3456d4fbd..5e0070f35bd6 100644 --- a/bitnami/kubeapps-dashboard/2/debian-11/tags-info.yaml +++ b/bitnami/kubeapps-dashboard/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - "2-debian-11" - - "2.5.1" + - "2.6.0" - "latest" diff --git a/bitnami/kubeapps-dashboard/README.md b/bitnami/kubeapps-dashboard/README.md index dda420ed6921..ab879c522df8 100644 --- a/bitnami/kubeapps-dashboard/README.md +++ b/bitnami/kubeapps-dashboard/README.md @@ -35,8 +35,9 @@ 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/). +You can see the equivalence between the different tags by taking a look at the `tags-info.yaml` file present in the branch folder, i.e `bitnami/ASSET/BRANCH/DISTRO/tags-info.yaml`. -* [`2`, `2-debian-11`, `2.5.1`, `2.5.1-debian-11-r13`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/kubeapps-dashboard/2/debian-11/Dockerfile) +Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers). ## Configuration