10.3.23-debian-10-r73 release
This commit is contained in:
parent
e657e00b7e
commit
832ea93a6a
|
|
@ -20,7 +20,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.3.23-debian-10-r72" \
|
||||
BITNAMI_IMAGE_VERSION="10.3.23-debian-10-r73" \
|
||||
PATH="/opt/bitnami/common/bin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:$PATH"
|
||||
|
||||
EXPOSE 3306
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
version: '2'
|
||||
version: '2.1'
|
||||
|
||||
services:
|
||||
mariadb:
|
||||
|
|
@ -10,6 +10,11 @@ services:
|
|||
environment:
|
||||
# ALLOW_EMPTY_PASSWORD is recommended only for development.
|
||||
- ALLOW_EMPTY_PASSWORD=yes
|
||||
healthcheck:
|
||||
test: ['CMD', '/opt/bitnami/scripts/mariadb/healthcheck.sh']
|
||||
interval: 15s
|
||||
timeout: 5s
|
||||
retries: 6
|
||||
|
||||
volumes:
|
||||
mariadb_data:
|
||||
|
|
|
|||
|
|
@ -1203,3 +1203,24 @@ find_jemalloc_lib() {
|
|||
done
|
||||
echo "${path:-}"
|
||||
}
|
||||
|
||||
########################
|
||||
# Execute a reliable health check against the current mysql instance
|
||||
# Globals:
|
||||
# DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD
|
||||
# Arguments:
|
||||
# None
|
||||
# Returns:
|
||||
# mysqladmin output
|
||||
#########################
|
||||
mysql_healthcheck() {
|
||||
local args=("-uroot" "-h0.0.0.0")
|
||||
local root_password
|
||||
|
||||
root_password="$(get_master_env_var_value ROOT_PASSWORD)"
|
||||
if [[ -n "$root_password" ]]; then
|
||||
args+=("-p${root_password}")
|
||||
fi
|
||||
|
||||
mysqladmin "${args[@]}" ping && mysqladmin "${args[@]}" status
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
#!/bin/bash
|
||||
|
||||
# shellcheck disable=SC1091
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
# set -o xtrace # Uncomment this line for debugging purposes
|
||||
|
||||
# Load libraries
|
||||
. /opt/bitnami/scripts/libmariadb.sh
|
||||
|
||||
# Load MySQL environment variables
|
||||
. /opt/bitnami/scripts/mariadb-env.sh
|
||||
|
||||
mysql_healthcheck
|
||||
|
|
@ -46,7 +46,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
|
|||
|
||||
* [`10.5-debian-10`, `10.5.4-debian-10-r32`, `10.5`, `10.5.4`, `latest` (10.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.5.4-debian-10-r32/10.5/debian-10/Dockerfile)
|
||||
* [`10.4-debian-10`, `10.4.13-debian-10-r74`, `10.4`, `10.4.13` (10.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.4.13-debian-10-r74/10.4/debian-10/Dockerfile)
|
||||
* [`10.3-debian-10`, `10.3.23-debian-10-r72`, `10.3`, `10.3.23` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.3.23-debian-10-r72/10.3/debian-10/Dockerfile)
|
||||
* [`10.3-debian-10`, `10.3.23-debian-10-r73`, `10.3`, `10.3.23` (10.3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.3.23-debian-10-r73/10.3/debian-10/Dockerfile)
|
||||
* [`10.2-debian-10`, `10.2.32-debian-10-r77`, `10.2`, `10.2.32` (10.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.2.32-debian-10-r77/10.2/debian-10/Dockerfile)
|
||||
* [`10.1-debian-10`, `10.1.45-debian-10-r77`, `10.1`, `10.1.45` (10.1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mariadb/blob/10.1.45-debian-10-r77/10.1/debian-10/Dockerfile)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue