diff --git a/bitnami/mariadb-galera/10.5/debian-11/Dockerfile b/bitnami/mariadb-galera/10.5/debian-11/Dockerfile index 0ce0b6ccc53e..bb1e506c7025 100644 --- a/bitnami/mariadb-galera/10.5/debian-11/Dockerfile +++ b/bitnami/mariadb-galera/10.5/debian-11/Dockerfile @@ -2,12 +2,11 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH -LABEL com.vmware.cp.artifact.flavor="sha256:109c7d51bd69bb6b3df71017440c1ea0699454f81fe188056c083f0b57c96ea6" \ - org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-05-03T08:12:25Z" \ +LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-05-06T08:35:43Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.5.19-debian-11-r25" \ + org.opencontainers.image.ref.name="10.5.19-debian-11-r26" \ org.opencontainers.image.title="mariadb-galera" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="10.5.19" diff --git a/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index e573899abacb..02c989d693ae 100644 --- a/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/mariadb-galera/10.5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -412,11 +412,16 @@ generate_random_string() { ascii) filter="[:print:]" ;; + numeric) + filter="0-9" + ;; alphanumeric) filter="a-zA-Z0-9" ;; - numeric) - filter="0-9" + alphanumeric+special|special+alphanumeric) + # Limit variety of special characters, so there is a higher chance of containing more alphanumeric characters + # Special characters are harder to write, and it could impact the overall UX if most passwords are too complex + filter='a-zA-Z0-9!@#$%^' ;; *) echo "Invalid type ${type}" >&2 @@ -647,4 +652,4 @@ run_chroot() { else chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@" fi -} \ No newline at end of file +} diff --git a/bitnami/mariadb-galera/10.5/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh b/bitnami/mariadb-galera/10.5/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh index f5aca4107089..2ec9ecc8a07f 100644 --- a/bitnami/mariadb-galera/10.5/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh +++ b/bitnami/mariadb-galera/10.5/debian-11/rootfs/opt/bitnami/scripts/mariadb-env.sh @@ -33,6 +33,7 @@ mariadb_env_vars=( MARIADB_MASTER_PORT_NUMBER MARIADB_MASTER_ROOT_USER MARIADB_MASTER_ROOT_PASSWORD + MARIADB_MASTER_DELAY MARIADB_REPLICATION_USER MARIADB_REPLICATION_PASSWORD MARIADB_PORT_NUMBER @@ -138,6 +139,8 @@ export MARIADB_MASTER_ROOT_USER="${MARIADB_MASTER_ROOT_USER:-root}" export DB_MASTER_ROOT_USER="$MARIADB_MASTER_ROOT_USER" # only used during the first initialization export MARIADB_MASTER_ROOT_PASSWORD="${MARIADB_MASTER_ROOT_PASSWORD:-}" export DB_MASTER_ROOT_PASSWORD="$MARIADB_MASTER_ROOT_PASSWORD" # only used during the first initialization +export MARIADB_MASTER_DELAY="${MARIADB_MASTER_DELAY:-0}" +export DB_MASTER_DELAY="$MARIADB_MASTER_DELAY" # only used during the first initialization export MARIADB_REPLICATION_USER="${MARIADB_REPLICATION_USER:-}" export DB_REPLICATION_USER="$MARIADB_REPLICATION_USER" # only used during the first initialization export MARIADB_REPLICATION_PASSWORD="${MARIADB_REPLICATION_PASSWORD:-}"