From 6f92d78c472a5f0e1efc9907ac7712afa2507ba9 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 23 Sep 2022 04:04:50 +0200 Subject: [PATCH] [bitnami/odoo] Release 15.0.20220810-debian-11-r14 (#7495) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/odoo/15/debian-11/Dockerfile | 2 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 55 +++++++++++++++++++ .../prebuildfs/usr/sbin/install_packages | 7 ++- bitnami/odoo/README.md | 2 +- 4 files changed, 61 insertions(+), 5 deletions(-) diff --git a/bitnami/odoo/15/debian-11/Dockerfile b/bitnami/odoo/15/debian-11/Dockerfile index 820d04be8b2e..968ab12b2040 100644 --- a/bitnami/odoo/15/debian-11/Dockerfile +++ b/bitnami/odoo/15/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="15.0.20220810-debian-11-r13" \ + org.opencontainers.image.ref.name="15.0.20220810-debian-11-r14" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/odoo" \ org.opencontainers.image.title="odoo" \ org.opencontainers.image.vendor="VMware, Inc." \ diff --git a/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 08b1d4884c28..92530b32d94d 100644 --- a/bitnami/odoo/15/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/odoo/15/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/odoo/15/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/odoo/15/debian-11/prebuildfs/usr/sbin/install_packages index 2c915f265c9d..77857a1a57f2 100755 --- a/bitnami/odoo/15/debian-11/prebuildfs/usr/sbin/install_packages +++ b/bitnami/odoo/15/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/odoo/README.md b/bitnami/odoo/README.md index 126b863aa247..7a636b2757f8 100644 --- a/bitnami/odoo/README.md +++ b/bitnami/odoo/README.md @@ -38,7 +38,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) for deploy 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/). -- [`15`, `15-debian-11`, `15.0.20220810`, `15.0.20220810-debian-11-r13`, `latest` (15/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/odoo/15/debian-11/Dockerfile) +- [`15`, `15-debian-11`, `15.0.20220810`, `15.0.20220810-debian-11-r14`, `latest` (15/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/odoo/15/debian-11/Dockerfile) - [`14`, `14-debian-11`, `14.0.20220910`, `14.0.20220910-debian-11-r4` (14/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/odoo/14/debian-11/Dockerfile) - [`13`, `13-debian-11`, `13.0.20220910`, `13.0.20220910-debian-11-r3` (13/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/odoo/13/debian-11/Dockerfile)