Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-20 23:10:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from sameersbn/fix-master-user-default

Browse Source 
set default value of `MARIADB_MASTER_USER` to `root`
This commit is contained in:
Sameer Naik
2016-01-30 12:39:16 +05:30
parent 7b05a5f006 5725653c6f
commit 3f3da8f454
4 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/mariadb/help.txt
View File

@@ -9,7 +9,7 @@
MARIADB_REPLICATION_USER: Replication user. User is created on master on the first boot (default: none).
MARIADB_REPLICATION_PASSWORD: Replication users password. Password is set for MARIADB_REPLICATION_USER on master on the first boot (default: none).
MARIADB_MASTER_HOST: Replication masters hostname/ip (parameter available only on slave).
MARIADB_MASTER_USER: User on replication master with access to MARIADB_DATABASE (parameter available only on slave).
MARIADB_MASTER_USER: User on replication master with access to MARIADB_DATABASE. (default: root, parameter available only on slave).
MARIADB_MASTER_PASSWORD: Password of user on replication master with access to MARIADB_DATABASE (parameter available only on slave).
VOLUMES:

2
bitnami/mariadb/help.yaml
View File

@@ -7,7 +7,7 @@ environment_variables:
MARIADB_REPLICATION_USER: "Replication user. User is created on master on the first boot (default: none)."
MARIADB_REPLICATION_PASSWORD: "Replication users password. Password is set for MARIADB_REPLICATION_USER on master on the first boot (default: none)."
MARIADB_MASTER_HOST: "Replication masters hostname/ip (parameter available only on slave)."
MARIADB_MASTER_USER: "User on replication master with access to MARIADB_DATABASE (parameter available only on slave)."
MARIADB_MASTER_USER: "User on replication master with access to MARIADB_DATABASE. (default: root, parameter available only on slave)."
MARIADB_MASTER_PASSWORD: "Password of user on replication master with access to MARIADB_DATABASE (parameter available only on slave)."
volumes:
$BITNAMI_APP_VOL_PREFIX/data: "Location of $BITNAMI_APP_NAME data files."

5
bitnami/mariadb/rootfs/bitnami-utils-custom.sh
View File

@@ -97,9 +97,8 @@ configure_replication() {
fi
if [ ! $MARIADB_MASTER_USER ]; then
echo "In order to setup a replication slave you need to provide the MARIADB_MASTER_USER as well"
echo ""
exit -1
echo "MARIADB_MASTER_USER not specified. Defaulting to root"
MARIADB_MASTER_USER=${MARIADB_MASTER_USER:-root}
fi
if [ ! $MARIADB_DATABASE ]; then

8
bitnami/mariadb/test.sh
View File

@@ -207,14 +207,6 @@ cleanup_environment
[[ "$output" =~ "you need to provide the MARIADB_MASTER_HOST" ]]
}
@test "Can't setup replication slave without master user" {
# create replication slave without specifying MARIADB_MASTER_USER
run container_create slave0 \
-e MARIADB_REPLICATION_MODE=slave \
-e MARIADB_MASTER_HOST=master
[[ "$output" =~ "you need to provide the MARIADB_MASTER_USER" ]]
}
@test "Can't setup replication slave without database" {
# create replication slave without specifying MARIADB_DATABASE
run container_create slave0 \