diff --git a/bitnami/mariadb-galera/10.3/debian-10/Dockerfile b/bitnami/mariadb-galera/10.3/debian-10/Dockerfile index 23c9939f6b4b..4f30502acc90 100644 --- a/bitnami/mariadb-galera/10.3/debian-10/Dockerfile +++ b/bitnami/mariadb-galera/10.3/debian-10/Dockerfile @@ -9,9 +9,9 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip iproute2 ldap-utils libaio1 libaudit1 libc6 libcap-ng0 libgcc1 libicu63 libjemalloc2 liblzma5 libncurses6 libnss-ldapd libpam-ldapd libpam0g libssl1.1 libstdc++6 libtinfo6 libxml2 nslcd procps psmisc rsync socat tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ini-file" "1.4.1-6" --checksum a947aad3f8cab0ff7c76506e1ea09156dfd442a6842500d1b8203f735b0e6b84 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mariadb-galera" "10.3.34-4" --checksum 1890a451f952b2fe2e637dd67c8562dd98f2e85c8687594d8b08cd8d03ef2a5d -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-6" --checksum 6f8fd2267481ffbe899a7f93b7b3076cd78dd70b7b9835bed79414932a749664 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "ini-file" "1.4.1-7" --checksum 7a4f45cbebd2e242278060415dd1a3f0dbe68991fdcaea5bb311e8de54a3e027 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mariadb-galera" "10.3.34-5" --checksum 578b7288be49eb6cf9d89642e22208559ef2e4bd27efee872e3b9f4f553af2f8 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-7" --checksum d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1 RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami @@ -20,7 +20,7 @@ RUN mkdir /docker-entrypoint-initdb.d COPY rootfs / RUN /opt/bitnami/scripts/mariadb-galera/postunpack.sh ENV BITNAMI_APP_NAME="mariadb-galera" \ - BITNAMI_IMAGE_VERSION="10.3.34-debian-10-r15" \ + BITNAMI_IMAGE_VERSION="10.3.34-debian-10-r16" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH" EXPOSE 3306 4444 4567 4568 diff --git a/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 169bb4915da0..07cef1b1d2b8 100644 --- a/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,23 +1,23 @@ { "gosu": { "arch": "amd64", - "digest": "6f8fd2267481ffbe899a7f93b7b3076cd78dd70b7b9835bed79414932a749664", + "digest": "d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1", "distro": "debian-10", "type": "NAMI", - "version": "1.14.0-6" + "version": "1.14.0-7" }, "ini-file": { "arch": "amd64", - "digest": "a947aad3f8cab0ff7c76506e1ea09156dfd442a6842500d1b8203f735b0e6b84", + "digest": "7a4f45cbebd2e242278060415dd1a3f0dbe68991fdcaea5bb311e8de54a3e027", "distro": "debian-10", "type": "NAMI", - "version": "1.4.1-6" + "version": "1.4.1-7" }, "mariadb-galera": { "arch": "amd64", - "digest": "1890a451f952b2fe2e637dd67c8562dd98f2e85c8687594d8b08cd8d03ef2a5d", + "digest": "578b7288be49eb6cf9d89642e22208559ef2e4bd27efee872e3b9f4f553af2f8", "distro": "debian-10", "type": "NAMI", - "version": "10.3.34-4" + "version": "10.3.34-5" } } \ No newline at end of file diff --git a/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh index 21b964ff1cf4..1b504b1df458 100644 --- a/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/mariadb-galera/10.3/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -74,9 +74,8 @@ is_dir_empty() { # boolean ######################### is_mounted_dir_empty() { - local -r path="${1:?missing directory}" - # Calculate real path in order to avoid issues with symlinks - local -r dir="$(realpath "$path")" + local dir="${1:?missing directory}" + if is_dir_empty "$dir" || find "$dir" -mindepth 1 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" -exec false {} +; then true else diff --git a/bitnami/mariadb-galera/README.md b/bitnami/mariadb-galera/README.md index 7d348ef33bd5..6be6afb49470 100644 --- a/bitnami/mariadb-galera/README.md +++ b/bitnami/mariadb-galera/README.md @@ -56,7 +56,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`10.6`, `10.6-debian-10`, `10.6.7`, `10.6.7-debian-10-r9`, `latest` (10.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.6.7-debian-10-r9/10.6/debian-10/Dockerfile) * [`10.5`, `10.5-debian-10`, `10.5.15`, `10.5.15-debian-10-r8` (10.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.5.15-debian-10-r8/10.5/debian-10/Dockerfile) * [`10.4`, `10.4-debian-10`, `10.4.24`, `10.4.24-debian-10-r9` (10.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.4.24-debian-10-r9/10.4/debian-10/Dockerfile) -* [`10.3`, `10.3-debian-10`, `10.3.34`, `10.3.34-debian-10-r15` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.3.34-debian-10-r15/10.3/debian-10/Dockerfile) +* [`10.3`, `10.3-debian-10`, `10.3.34`, `10.3.34-debian-10-r16` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.3.34-debian-10-r16/10.3/debian-10/Dockerfile) * [`10.2`, `10.2-debian-10`, `10.2.43`, `10.2.43-debian-10-r14` (10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb-galera/blob/10.2.43-debian-10-r14/10.2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/mariadb-galera GitHub repo](https://github.com/bitnami/bitnami-docker-mariadb-galera).