diff --git a/bitnami/mariadb-galera/10.3/debian-11/Dockerfile b/bitnami/mariadb-galera/10.3/debian-11/Dockerfile index 59cc5a482155..3161b9931a8d 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-r10" \ + org.opencontainers.image.ref.name="10.3.36-debian-11-r11" \ 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." \ @@ -44,7 +44,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ tar -zxf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ rm -rf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN apt-get update && apt-get upgrade -y && \ - rm -r /var/lib/apt/lists /var/cache/apt/archives + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami RUN mkdir /docker-entrypoint-initdb.d 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 08b1d4884c28..e25f3b5d9594 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 @@ -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 diff --git a/bitnami/mariadb-galera/10.3/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/mariadb-galera/10.3/debian-11/prebuildfs/usr/sbin/install_packages index c9577647443b..77857a1a57f2 100755 --- a/bitnami/mariadb-galera/10.3/debian-11/prebuildfs/usr/sbin/install_packages +++ b/bitnami/mariadb-galera/10.3/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 ( @@ -21,4 +22,4 @@ until [ $n -gt $max ]; do echo "apt failed, retrying" n=$(($n + 1)) done -rm -r /var/lib/apt/lists /var/cache/apt/archives +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/mariadb-galera/README.md b/bitnami/mariadb-galera/README.md index 638ef10b8f07..9067c09eeaf2 100644 --- a/bitnami/mariadb-galera/README.md +++ b/bitnami/mariadb-galera/README.md @@ -51,13 +51,13 @@ 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/). -* [`10.9`, `10.9-debian-11`, `10.9.3`, `10.9.3-debian-11-r-1`, `latest` (10.9/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mariadb-galera/10.9/debian-11/Dockerfile) +* [`10.9`, `10.9-debian-11`, `10.9.3`, `10.9.3-debian-11-r0`, `latest` (10.9/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mariadb-galera/10.9/debian-11/Dockerfile) * [`10.8`, `10.8-debian-11`, `10.8.5`, `10.8.5-debian-11-r0` (10.8/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mariadb-galera/10.8/debian-11/Dockerfile) * [`10.7`, `10.7-debian-11`, `10.7.6`, `10.7.6-debian-11-r0` (10.7/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/mariadb-galera/10.7/debian-11/Dockerfile) * [`10.6`, `10.6-debian-11`, `10.6.10`, `10.6.10-debian-11-r0` (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-r11` (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-r10` (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-r10` (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-r11` (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).