diff --git a/bitnami/mariadb-galera/10.3/debian-11/Dockerfile b/bitnami/mariadb-galera/10.3/debian-11/Dockerfile index 3161b9931a8d..d7b384887624 100644 --- a/bitnami/mariadb-galera/10.3/debian-11/Dockerfile +++ b/bitnami/mariadb-galera/10.3/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="10.3.36-debian-11-r11" \ + org.opencontainers.image.ref.name="10.3.36-debian-11-r12" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mariadb-galera" \ org.opencontainers.image.title="mariadb-galera" \ 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 iproute2 ldap-utils libaio1 libaudit1 libc6 libcap-ng0 libcrypt1 libgcc-s1 libicu67 libjemalloc2 libldap-common liblzma5 libncurses6 libpam-ldapd libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 nslcd procps psmisc rsync socat tar zlib1g +RUN install_packages ca-certificates curl iproute2 ldap-utils libaio1 libaudit1 libc6 libcap-ng0 libcrypt1 libgcc-s1 libicu67 libjemalloc2 libldap-common liblzma5 libncurses6 libpam-ldapd libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 nslcd procps psmisc rsync socat zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ if [ ! -f ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ curl -SsLf https://downloads.bitnami.com/files/stacksmith/ini-file-1.4.3-153-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ diff --git a/bitnami/mariadb-galera/10.3/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/mariadb-galera/10.3/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index e25f3b5d9594..92530b32d94d 100644 --- a/bitnami/mariadb-galera/10.3/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/mariadb-galera/10.3/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -506,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/mariadb-galera/README.md b/bitnami/mariadb-galera/README.md index 593ae9c3c676..b3c6bf0ba966 100644 --- a/bitnami/mariadb-galera/README.md +++ b/bitnami/mariadb-galera/README.md @@ -57,7 +57,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`10.6`, `10.6-debian-11`, `10.6.10`, `10.6.10-debian-11-r1` (10.6/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mariadb-galera/10.6/debian-11/Dockerfile) * [`10.5`, `10.5-debian-11`, `10.5.17`, `10.5.17-debian-11-r12` (10.5/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mariadb-galera/10.5/debian-11/Dockerfile) * [`10.4`, `10.4-debian-11`, `10.4.26`, `10.4.26-debian-11-r11` (10.4/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mariadb-galera/10.4/debian-11/Dockerfile) -* [`10.3`, `10.3-debian-11`, `10.3.36`, `10.3.36-debian-11-r11` (10.3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mariadb-galera/10.3/debian-11/Dockerfile) +* [`10.3`, `10.3-debian-11`, `10.3.36`, `10.3.36-debian-11-r12` (10.3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mariadb-galera/10.3/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).