10.3.34-debian-10-r53 release
This commit is contained in:
parent
61ec43947b
commit
5ea3e2c76c
|
|
@ -154,6 +154,9 @@ pid_file=${DB_PID_FILE}
|
|||
max_allowed_packet=16M
|
||||
bind_address=${DB_DEFAULT_BIND_ADDRESS}
|
||||
log_error=${DB_LOGS_DIR}/mysqld.log
|
||||
slow_query_log=${DB_ENABLE_SLOW_QUERY}
|
||||
slow_query_log_file=${DB_LOGS_DIR}/mysqld.log
|
||||
long_query_time=${DB_LONG_QUERY_TIME}
|
||||
character_set_server=${DB_DEFAULT_CHARACTER_SET}
|
||||
collation_server=${DB_DEFAULT_COLLATE}
|
||||
plugin_dir=${DB_BASE_DIR}/lib/plugin
|
||||
|
|
@ -1249,6 +1252,8 @@ mysql_update_custom_config() {
|
|||
! is_empty_value "$DB_BIND_ADDRESS" && mysql_conf_set "bind_address" "$DB_BIND_ADDRESS"
|
||||
! is_empty_value "$DB_AUTHENTICATION_PLUGIN" && mysql_conf_set "default_authentication_plugin" "$DB_AUTHENTICATION_PLUGIN"
|
||||
! is_empty_value "$DB_SQL_MODE" && mysql_conf_set "sql_mode" "$DB_SQL_MODE"
|
||||
! is_empty_value "$DB_ENABLE_SLOW_QUERY" && mysql_conf_set "slow_query_log" "$DB_ENABLE_SLOW_QUERY"
|
||||
! is_empty_value "$DB_LONG_QUERY_TIME" && mysql_conf_set "long_query_time" "$DB_LONG_QUERY_TIME"
|
||||
|
||||
# Avoid exit code of previous commands to affect the result of this function
|
||||
true
|
||||
|
|
|
|||
|
|
@ -51,6 +51,10 @@ mariadb_env_vars=(
|
|||
MARIADB_CLIENT_EXTRA_FLAGS
|
||||
MARIADB_STARTUP_WAIT_RETRIES
|
||||
MARIADB_STARTUP_WAIT_SLEEP_TIME
|
||||
MARIADB_ENABLE_SLOW_QUERY
|
||||
MARIADB_LONG_QUERY_TIME
|
||||
DB_ENABLE_SLOW_QUERY
|
||||
DB_LONG_QUERY_TIME
|
||||
)
|
||||
for env_var in "${mariadb_env_vars[@]}"; do
|
||||
file_env_var="${env_var}_FILE"
|
||||
|
|
@ -156,5 +160,11 @@ export MARIADB_STARTUP_WAIT_RETRIES="${MARIADB_STARTUP_WAIT_RETRIES:-300}"
|
|||
export DB_STARTUP_WAIT_RETRIES="$MARIADB_STARTUP_WAIT_RETRIES"
|
||||
export MARIADB_STARTUP_WAIT_SLEEP_TIME="${MARIADB_STARTUP_WAIT_SLEEP_TIME:-2}"
|
||||
export DB_STARTUP_WAIT_SLEEP_TIME="$MARIADB_STARTUP_WAIT_SLEEP_TIME"
|
||||
MARIADB_ENABLE_SLOW_QUERY="${MARIADB_ENABLE_SLOW_QUERY:-"${DB_ENABLE_SLOW_QUERY:-}"}"
|
||||
export MARIADB_ENABLE_SLOW_QUERY="${MARIADB_ENABLE_SLOW_QUERY:-0}"
|
||||
export DB_ENABLE_SLOW_QUERY="$MARIADB_ENABLE_SLOW_QUERY"
|
||||
MARIADB_LONG_QUERY_TIME="${MARIADB_LONG_QUERY_TIME:-"${DB_LONG_QUERY_TIME:-}"}"
|
||||
export MARIADB_LONG_QUERY_TIME="${MARIADB_LONG_QUERY_TIME:-10.0}"
|
||||
export DB_LONG_QUERY_TIME="$MARIADB_LONG_QUERY_TIME"
|
||||
|
||||
# Custom environment variables may be defined below
|
||||
|
|
|
|||
|
|
@ -28,4 +28,4 @@ done
|
|||
ln -sf "$DB_BASE_DIR/plugin" "$DB_BASE_DIR/lib/plugin"
|
||||
|
||||
# Redirect all logging to stdout
|
||||
ln -sf /dev/stdout "$DB_LOGS_DIR/mysqld.log"
|
||||
ln -sf "/proc/1/fd/1" "$DB_LOGS_DIR/mysqld.log"
|
||||
|
|
|
|||
|
|
@ -54,7 +54,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-r50` (10.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.6.7-debian-10-r50/10.6/debian-10/Dockerfile)
|
||||
* [`10.5`, `10.5-debian-10`, `10.5.15`, `10.5.15-debian-10-r52` (10.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.5.15-debian-10-r52/10.5/debian-10/Dockerfile)
|
||||
* [`10.4`, `10.4-debian-10`, `10.4.24`, `10.4.24-debian-10-r51` (10.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.4.24-debian-10-r51/10.4/debian-10/Dockerfile)
|
||||
* [`10.3`, `10.3-debian-10`, `10.3.34`, `10.3.34-debian-10-r52` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.3.34-debian-10-r52/10.3/debian-10/Dockerfile)
|
||||
* [`10.3`, `10.3-debian-10`, `10.3.34`, `10.3.34-debian-10-r53` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.3.34-debian-10-r53/10.3/debian-10/Dockerfile)
|
||||
* [`10.2`, `10.2-debian-10`, `10.2.43`, `10.2.43-debian-10-r50` (10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.2.43-debian-10-r50/10.2/debian-10/Dockerfile)
|
||||
|
||||
Subscribe to project updates by watching the [bitnami/mariadb GitHub repo](https://github.com/bitnami/bitnami-docker-mariadb).
|
||||
|
|
|
|||
Loading…
Reference in New Issue