diff --git a/bitnami/nginx/1.22/debian-11/Dockerfile b/bitnami/nginx/1.22/debian-11/Dockerfile index df15d88a5ea0..caa60ef637d4 100644 --- a/bitnami/nginx/1.22/debian-11/Dockerfile +++ b/bitnami/nginx/1.22/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="1.22.0-debian-11-r40" \ + org.opencontainers.image.ref.name="1.22.0-debian-11-r41" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/nginx" \ org.opencontainers.image.title="nginx" \ 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 acl ca-certificates curl gzip libcrypt1 libgeoip1 libpcre3 libssl1.1 procps tar zlib1g +RUN install_packages ca-certificates curl gzip libcrypt1 libgeoip1 libpcre3 libssl1.1 procps tar zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ if [ ! -f render-template-1.0.3-153-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ curl -SsLf https://downloads.bitnami.com/files/stacksmith/render-template-1.0.3-153-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ diff --git a/bitnami/nginx/1.22/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/nginx/1.22/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 08b1d4884c28..92530b32d94d 100644 --- a/bitnami/nginx/1.22/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/nginx/1.22/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -197,6 +197,8 @@ am_i_root() { # --version - Distro version # --branch - Distro branch # --codename - Distro codename +# --name - Distro name +# --pretty-name - Distro pretty name # Returns: # String ######################### @@ -223,6 +225,12 @@ get_os_metadata() { --codename) get_os_release_metadata VERSION_CODENAME ;; + --name) + get_os_release_metadata NAME + ;; + --pretty-name) + get_os_release_metadata PRETTY_NAME + ;; *) error "Unknown flag ${flag_name}" return 1 @@ -498,3 +506,50 @@ get_machine_id() { fi echo "$machine_id" } + +######################## +# Get the root partition's disk device ID (e.g. /dev/sda1) +# Globals: +# None +# Arguments: +# None +# Returns: +# Root partition disk 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)" + fi + # If it could not be autodetected, fallback to /dev/sda1 as a default + if [[ -z "$device_id" || ! -b "$device_id" ]]; then + device_id="/dev/sda1" + fi + echo "$device_id" +} + +######################## +# Get the root disk device ID (e.g. /dev/sda) +# Globals: +# None +# Arguments: +# None +# Returns: +# Root disk ID +######################### +get_root_disk_device_id() { + get_disk_device_id | sed 's/[0-9]\+$//' +} + +######################## +# Get the root disk size in bytes +# Globals: +# None +# Arguments: +# None +# Returns: +# Root disk size in bytes +######################### +get_root_disk_size() { + fdisk -l "$(get_root_disk_device_id)" | grep 'Disk.*bytes' | sed -E 's/.*, ([0-9]+) bytes,.*/\1/' || true +} diff --git a/bitnami/nginx/1.22/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/nginx/1.22/debian-11/prebuildfs/usr/sbin/install_packages index 2c915f265c9d..77857a1a57f2 100755 --- a/bitnami/nginx/1.22/debian-11/prebuildfs/usr/sbin/install_packages +++ b/bitnami/nginx/1.22/debian-11/prebuildfs/usr/sbin/install_packages @@ -1,9 +1,10 @@ #!/bin/sh -set -e -set -u -export DEBIAN_FRONTEND=noninteractive +set -eu + n=0 max=2 +export DEBIAN_FRONTEND=noninteractive + until [ $n -gt $max ]; do set +e ( diff --git a/bitnami/nginx/README.md b/bitnami/nginx/README.md index 8889d44b7c53..debc4a056015 100644 --- a/bitnami/nginx/README.md +++ b/bitnami/nginx/README.md @@ -45,8 +45,8 @@ 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/). -* [`1.23`, `1.23-debian-11`, `1.23.1`, `1.23.1-debian-11-r24`, `latest` (1.23/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/nginx/1.23/debian-11/Dockerfile) -* [`1.22`, `1.22-debian-11`, `1.22.0`, `1.22.0-debian-11-r40` (1.22/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/nginx/1.22/debian-11/Dockerfile) +* [`1.23`, `1.23-debian-11`, `1.23.1`, `1.23.1-debian-11-r23`, `latest` (1.23/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/nginx/1.23/debian-11/Dockerfile) +* [`1.22`, `1.22-debian-11`, `1.22.0`, `1.22.0-debian-11-r41` (1.22/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/nginx/1.22/debian-11/Dockerfile) ## Get this image