public_git
/
bitnami-containers
mirror of https://github.com/bitnami/containers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

10.4.18-debian-10-r54 release

This commit is contained in:
Bitnami Bot 2021-04-21 06:13:52 +00:00
parent e703f0c9de
commit 4e45155be7
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/mariadb/10.4/debian-10/Dockerfile
View File

@ -18,7 +18,7 @@ RUN mkdir /docker-entrypoint-initdb.d
COPY rootfs /
RUN /opt/bitnami/scripts/mariadb/postunpack.sh
ENV BITNAMI_APP_NAME="mariadb" \
BITNAMI_IMAGE_VERSION="10.4.18-debian-10-r53" \
BITNAMI_IMAGE_VERSION="10.4.18-debian-10-r54" \
PATH="/opt/bitnami/common/bin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH"
EXPOSE 3306

17
bitnami/mariadb/10.4/debian-10/rootfs/opt/bitnami/scripts/libmariadb.sh
View File

@ -1007,15 +1007,16 @@ EOF
mysql_ensure_user_has_database_privileges() {
local -r user="${1:?user is required}"
local -r database="${2:?db is required}"
local -r db_host="${3:-}"
local -r db_port="${4:-}"
local -r privileges="${3:-all}"
local -r db_host="${4:-}"
local -r db_port="${5:-}"
local -a mysql_execute_cmd=("mysql_execute")
[[ -n "$db_host" && -n "$db_port" ]] && mysql_execute_cmd=("mysql_remote_execute" "$db_host" "$db_port")
debug "Providing privileges to username $user on database $database"
"${mysql_execute_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <<EOF
grant all on \`$database\`.* to '$user'@'%';
grant ${privileges} on \`${database}\`.* to '${user}'@'%';
EOF
}
@ -1103,6 +1104,7 @@ mysql_ensure_optional_database_exists() {
local character_set=""
local collate=""
local user=""
local privileges=""
# For accessing an external database
local db_host=""
local db_port=""
@ -1131,6 +1133,10 @@ mysql_ensure_optional_database_exists() {
shift
db_port="${1:?missing database port}"
;;
--privileges)
shift
privileges="${1:?missing privileges}"
;;
*)
echo "Invalid command line flag $1" >&2
return 1
@ -1147,10 +1153,7 @@ mysql_ensure_optional_database_exists() {
mysql_ensure_database_exists "${flags[@]}"
if [[ -n "$user" ]]; then
local -a grant_flags=("$user" "$database")
[[ -n "$db_host" ]] && grant_flags+=("$db_host")
[[ -n "$db_port" ]] && grant_flags+=("$db_port")
mysql_ensure_user_has_database_privileges "${grant_flags[@]}"
mysql_ensure_user_has_database_privileges "$user" "$database" "$privileges" "$db_host" "$db_port"
fi
}

2
bitnami/mariadb/README.md
View File

@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
* [`10.5`, `10.5-debian-10`, `10.5.9`, `10.5.9-debian-10-r54`, `latest` (10.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.5.9-debian-10-r54/10.5/debian-10/Dockerfile)
* [`10.4`, `10.4-debian-10`, `10.4.18`, `10.4.18-debian-10-r53` (10.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.4.18-debian-10-r53/10.4/debian-10/Dockerfile)
* [`10.4`, `10.4-debian-10`, `10.4.18`, `10.4.18-debian-10-r54` (10.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.4.18-debian-10-r54/10.4/debian-10/Dockerfile)
* [`10.3`, `10.3-debian-10`, `10.3.28`, `10.3.28-debian-10-r53` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.3.28-debian-10-r53/10.3/debian-10/Dockerfile)
* [`10.2`, `10.2-debian-10`, `10.2.37`, `10.2.37-debian-10-r54` (10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.2.37-debian-10-r54/10.2/debian-10/Dockerfile)