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

Add ---skip-test-db capabilities (#237)

This commit is contained in:
sebastienmusso 2021-05-24 13:41:14 +02:00 committed by GitHub
parent e5394d103c
commit f4e043b090
9 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bitnami/mariadb/10.2/debian-10/rootfs/opt/bitnami/scripts/libmariadb.sh
View File

@ -707,6 +707,9 @@ mysql_install_db() {
am_i_root && args=("${args[@]}" "--user=$DB_DAEMON_USER")
if [[ "$DB_FLAVOR" = "mariadb" ]]; then
args+=("--auth-root-authentication-method=normal")
if [[ ! "$(mysql_get_version)" =~ ^10.[01234]. ]]; then
is_boolean_yes "$MARIADB_SKIP_TEST_DB" && args+=("--skip-test-db")
fi
else
command="${DB_BIN_DIR}/mysqld"
args+=("--initialize-insecure")

2
bitnami/mariadb/10.2/debian-10/rootfs/opt/bitnami/scripts/mariadb-env.sh
View File

@ -47,6 +47,7 @@ mariadb_env_vars=(
MARIADB_CLIENT_SSL_CERT_FILE
MARIADB_CLIENT_SSL_KEY_FILE
MARIADB_CLIENT_EXTRA_FLAGS
MARIADB_SKIP_TEST_DB
)
for env_var in "${mariadb_env_vars[@]}"; do
file_env_var="${env_var}_FILE"
@ -148,3 +149,4 @@ export MARIADB_CLIENT_EXTRA_FLAGS="${MARIADB_CLIENT_EXTRA_FLAGS:-no}"
export DB_CLIENT_EXTRA_FLAGS="$MARIADB_CLIENT_EXTRA_FLAGS"
# Custom environment variables may be defined below
export MARIADB_SKIP_TEST_DB="${MARIADB_SKIP_TEST_DB:-no}"

3
bitnami/mariadb/10.3/debian-10/rootfs/opt/bitnami/scripts/libmariadb.sh
View File

@ -707,6 +707,9 @@ mysql_install_db() {
am_i_root && args=("${args[@]}" "--user=$DB_DAEMON_USER")
if [[ "$DB_FLAVOR" = "mariadb" ]]; then
args+=("--auth-root-authentication-method=normal")
if [[ ! "$(mysql_get_version)" =~ ^10.[01234]. ]]; then
is_boolean_yes "$MARIADB_SKIP_TEST_DB" && args+=("--skip-test-db")
fi
else
command="${DB_BIN_DIR}/mysqld"
args+=("--initialize-insecure")

2
bitnami/mariadb/10.3/debian-10/rootfs/opt/bitnami/scripts/mariadb-env.sh
View File

@ -47,6 +47,7 @@ mariadb_env_vars=(
MARIADB_CLIENT_SSL_CERT_FILE
MARIADB_CLIENT_SSL_KEY_FILE
MARIADB_CLIENT_EXTRA_FLAGS
MARIADB_SKIP_TEST_DB
)
for env_var in "${mariadb_env_vars[@]}"; do
file_env_var="${env_var}_FILE"
@ -148,3 +149,4 @@ export MARIADB_CLIENT_EXTRA_FLAGS="${MARIADB_CLIENT_EXTRA_FLAGS:-no}"
export DB_CLIENT_EXTRA_FLAGS="$MARIADB_CLIENT_EXTRA_FLAGS"
# Custom environment variables may be defined below
export MARIADB_SKIP_TEST_DB="${MARIADB_SKIP_TEST_DB:-no}"

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

@ -707,6 +707,9 @@ mysql_install_db() {
am_i_root && args=("${args[@]}" "--user=$DB_DAEMON_USER")
if [[ "$DB_FLAVOR" = "mariadb" ]]; then
args+=("--auth-root-authentication-method=normal")
if [[ ! "$(mysql_get_version)" =~ ^10.[01234]. ]]; then
is_boolean_yes "$MARIADB_SKIP_TEST_DB" && args+=("--skip-test-db")
fi
else
command="${DB_BIN_DIR}/mysqld"
args+=("--initialize-insecure")

2
bitnami/mariadb/10.4/debian-10/rootfs/opt/bitnami/scripts/mariadb-env.sh
View File

@ -47,6 +47,7 @@ mariadb_env_vars=(
MARIADB_CLIENT_SSL_CERT_FILE
MARIADB_CLIENT_SSL_KEY_FILE
MARIADB_CLIENT_EXTRA_FLAGS
MARIADB_SKIP_TEST_DB
)
for env_var in "${mariadb_env_vars[@]}"; do
file_env_var="${env_var}_FILE"
@ -148,3 +149,4 @@ export MARIADB_CLIENT_EXTRA_FLAGS="${MARIADB_CLIENT_EXTRA_FLAGS:-no}"
export DB_CLIENT_EXTRA_FLAGS="$MARIADB_CLIENT_EXTRA_FLAGS"
# Custom environment variables may be defined below
export MARIADB_SKIP_TEST_DB="${MARIADB_SKIP_TEST_DB:-no}"

3
bitnami/mariadb/10.5/debian-10/rootfs/opt/bitnami/scripts/libmariadb.sh
View File

@ -707,6 +707,9 @@ mysql_install_db() {
am_i_root && args=("${args[@]}" "--user=$DB_DAEMON_USER")
if [[ "$DB_FLAVOR" = "mariadb" ]]; then
args+=("--auth-root-authentication-method=normal")
if [[ ! "$(mysql_get_version)" =~ ^10.[01234]. ]]; then
is_boolean_yes "$MARIADB_SKIP_TEST_DB" && args+=("--skip-test-db")
fi
else
command="${DB_BIN_DIR}/mysqld"
args+=("--initialize-insecure")

3
bitnami/mariadb/10.5/debian-10/rootfs/opt/bitnami/scripts/mariadb-env.sh
View File

@ -47,6 +47,7 @@ mariadb_env_vars=(
MARIADB_CLIENT_SSL_CERT_FILE
MARIADB_CLIENT_SSL_KEY_FILE
MARIADB_CLIENT_EXTRA_FLAGS
MARIADB_SKIP_TEST_DB
)
for env_var in "${mariadb_env_vars[@]}"; do
file_env_var="${env_var}_FILE"
@ -75,7 +76,6 @@ export DB_CONF_FILE="${DB_CONF_DIR}/my.cnf"
export DB_PID_FILE="${DB_TMP_DIR}/mysqld.pid"
export DB_SOCKET_FILE="${DB_TMP_DIR}/mysql.sock"
export PATH="${DB_SBIN_DIR}:${DB_BIN_DIR}:/opt/bitnami/common/bin:${PATH}"
# System users (when running with a privileged user)
export DB_DAEMON_USER="mysql"
export DB_DAEMON_GROUP="mysql"
@ -148,3 +148,4 @@ export MARIADB_CLIENT_EXTRA_FLAGS="${MARIADB_CLIENT_EXTRA_FLAGS:-no}"
export DB_CLIENT_EXTRA_FLAGS="$MARIADB_CLIENT_EXTRA_FLAGS"
# Custom environment variables may be defined below
export MARIADB_SKIP_TEST_DB="${MARIADB_SKIP_TEST_DB:-no}"

15
bitnami/mariadb/README.md
View File

@ -259,6 +259,21 @@ services:
...
```
## Disable creation of test database
By default the MariaDB process create test database, in order to disable creation of test database "--skip-test-db" could be added on mysql_install_db process.
This function is available on version equal or higher than 10.5 of mariadb.
by passing the `SKIP_TEST_DB` environment variable when running the image for the first time, the test database won't be create
```console
$ docker run --name mariadb \
-e ALLOW_EMPTY_PASSWORD=yes \
-e SKIP_TEST_DB=true \
bitnami/mariadb:latest
```
## Creating a database on first run
By passing the `MARIADB_DATABASE` environment variable when running the image for the first time, a database will be created. This is useful if your application requires that a database already exists, saving you from having to manually create the database using the MySQL client.