From 0675ffeb067f36a27dc53d0d32853fd29214522d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 16 Sep 2021 05:52:11 +0000 Subject: [PATCH] 1.20.1-debian-10-r102 release --- bitnami/nginx/1.20/debian-10/Dockerfile | 2 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 43 ++++++++++++++++++- bitnami/nginx/README.md | 2 +- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/bitnami/nginx/1.20/debian-10/Dockerfile b/bitnami/nginx/1.20/debian-10/Dockerfile index 43411cb9ab5a..bf945f2db63c 100644 --- a/bitnami/nginx/1.20/debian-10/Dockerfile +++ b/bitnami/nginx/1.20/debian-10/Dockerfile @@ -19,7 +19,7 @@ RUN ln -sf /dev/stderr /opt/bitnami/nginx/logs/error.log COPY rootfs / RUN /opt/bitnami/scripts/nginx/postunpack.sh ENV BITNAMI_APP_NAME="nginx" \ - BITNAMI_IMAGE_VERSION="1.20.1-debian-10-r101" \ + BITNAMI_IMAGE_VERSION="1.20.1-debian-10-r102" \ NGINX_ENABLE_CUSTOM_PORTS="no" \ NGINX_HTTPS_PORT_NUMBER="" \ NGINX_HTTP_PORT_NUMBER="" \ diff --git a/bitnami/nginx/1.20/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/nginx/1.20/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh index a8323db72d93..4265aae0a673 100644 --- a/bitnami/nginx/1.20/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/nginx/1.20/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh @@ -141,10 +141,51 @@ am_i_root() { if [[ "$(id -u)" = "0" ]]; then true else - false + false fi } +######################## +# Print OS metadata +# Arguments: +# $1 - Flag name +# Flags: +# --id - Distro ID +# --version - Distro version +# --branch - Distro branch +# --codename - Distro codename +# Returns: +# String +######################### +get_os_metadata() { + local -r flag_name="${1:?missing flag}" + # Helper function + get_os_release_metadata() { + local -r env_name="${1:?missing environment variable name}" + ( + . /etc/os-release + echo "${!env_name}" + ) + } + case "$flag_name" in + --id) + get_os_release_metadata ID + ;; + --version) + get_os_release_metadata VERSION_ID + ;; + --branch) + get_os_release_metadata VERSION_ID | sed 's/\..*//' + ;; + --codename) + get_os_release_metadata VERSION_CODENAME + ;; + *) + error "Unknown flag ${flag_name}" + return 1 + esac +} + ######################## # Get total memory available # Arguments: diff --git a/bitnami/nginx/README.md b/bitnami/nginx/README.md index 1add223df2a5..645d711e4461 100644 --- a/bitnami/nginx/README.md +++ b/bitnami/nginx/README.md @@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`1.21`, `1.21-debian-10`, `1.21.3`, `1.21.3-debian-10-r8`, `latest` (1.21/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-nginx/blob/1.21.3-debian-10-r8/1.21/debian-10/Dockerfile) -* [`1.20`, `1.20-debian-10`, `1.20.1`, `1.20.1-debian-10-r101` (1.20/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-nginx/blob/1.20.1-debian-10-r101/1.20/debian-10/Dockerfile) +* [`1.20`, `1.20-debian-10`, `1.20.1`, `1.20.1-debian-10-r102` (1.20/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-nginx/blob/1.20.1-debian-10-r102/1.20/debian-10/Dockerfile) # Get this image