diff --git a/bitnami/parse/4/debian-11/Dockerfile b/bitnami/parse/4/debian-11/Dockerfile index e3e5874995a0..3b1ef112f171 100644 --- a/bitnami/parse/4/debian-11/Dockerfile +++ b/bitnami/parse/4/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="4.10.15-debian-11-r0" \ + org.opencontainers.image.ref.name="4.10.16-debian-11-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/parse" \ org.opencontainers.image.title="parse" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="4.10.15" + org.opencontainers.image.version="4.10.16" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -36,21 +36,21 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ tar -zxf node-14.20.0-3-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ rm -rf node-14.20.0-3-linux-${OS_ARCH}-debian-11.tar.gz node-14.20.0-3-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f mongodb-shell-1.5.4-2-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/mongodb-shell-1.5.4-2-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/mongodb-shell-1.5.4-2-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ + if [ ! -f mongodb-shell-1.6.0-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/mongodb-shell-1.6.0-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/mongodb-shell-1.6.0-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ fi && \ - sha256sum -c mongodb-shell-1.5.4-2-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf mongodb-shell-1.5.4-2-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf mongodb-shell-1.5.4-2-linux-${OS_ARCH}-debian-11.tar.gz mongodb-shell-1.5.4-2-linux-${OS_ARCH}-debian-11.tar.gz.sha256 + sha256sum -c mongodb-shell-1.6.0-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf mongodb-shell-1.6.0-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf mongodb-shell-1.6.0-0-linux-${OS_ARCH}-debian-11.tar.gz mongodb-shell-1.6.0-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f parse-4.10.15-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/parse-4.10.15-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/parse-4.10.15-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ + if [ ! -f parse-4.10.16-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/parse-4.10.16-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/parse-4.10.16-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ fi && \ - sha256sum -c parse-4.10.15-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf parse-4.10.15-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf parse-4.10.15-0-linux-${OS_ARCH}-debian-11.tar.gz parse-4.10.15-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 + sha256sum -c parse-4.10.16-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf parse-4.10.16-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf parse-4.10.16-0-linux-${OS_ARCH}-debian-11.tar.gz parse-4.10.16-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ if [ ! -f gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ @@ -65,7 +65,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/parse/postunpack.sh -ENV APP_VERSION="4.10.15" \ +ENV APP_VERSION="4.10.16" \ BITNAMI_APP_NAME="parse" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/mongodb/bin:/opt/bitnami/parse/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/parse/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/parse/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 97024015d16d..af474369b35b 100644 --- a/bitnami/parse/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/parse/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,10 +8,10 @@ }, "mongodb-shell": { "arch": "amd64", - "digest": "77e3526b982f5fc7160827d41d2fae83a4c3dd3c88dec6fa2b2ce4cbb0078ef8", + "digest": "106b6f4394fe3f4886a09f9d0b3b1dca753e1187068177d3ffde32b2794eb619", "distro": "debian-11", "type": "NAMI", - "version": "1.5.4-2" + "version": "1.6.0-0" }, "node": { "arch": "amd64", @@ -22,10 +22,10 @@ }, "parse": { "arch": "amd64", - "digest": "2ba31addd0efdfb3149467a1b830142a109558ebe4988755d2d1ec56162fcb76", + "digest": "2359721c124af90bf0e0125018e137e16b4cdf0b8f8a4b52a4696671f68ea169", "distro": "debian-11", "type": "NAMI", - "version": "4.10.15-0" + "version": "4.10.16-0" }, "python": { "arch": "amd64", diff --git a/bitnami/parse/4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/parse/4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 08b1d4884c28..92530b32d94d 100644 --- a/bitnami/parse/4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/parse/4/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/parse/4/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/parse/4/debian-11/prebuildfs/usr/sbin/install_packages index 2c915f265c9d..77857a1a57f2 100755 --- a/bitnami/parse/4/debian-11/prebuildfs/usr/sbin/install_packages +++ b/bitnami/parse/4/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/parse/4/debian-11/tags-info.yaml b/bitnami/parse/4/debian-11/tags-info.yaml index 86f1cb7b37bd..40caa02fea77 100644 --- a/bitnami/parse/4/debian-11/tags-info.yaml +++ b/bitnami/parse/4/debian-11/tags-info.yaml @@ -1,4 +1,4 @@ rolling-tags: - "4" - "4-debian-11" - - "4.10.15" + - "4.10.16" diff --git a/bitnami/parse/README.md b/bitnami/parse/README.md index d43d8dde379e..6c5926991e7e 100644 --- a/bitnami/parse/README.md +++ b/bitnami/parse/README.md @@ -44,7 +44,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`5`, `5-debian-11`, `5.2.7`, `5.2.7-debian-11-r0`, `latest` (5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/parse/5/debian-11/Dockerfile) -* [`4`, `4-debian-11`, `4.10.15`, `4.10.15-debian-11-r0` (4/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/parse/4/debian-11/Dockerfile) +* [`4`, `4-debian-11`, `4.10.16`, `4.10.16-debian-11-r0` (4/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/parse/4/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).