mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-11-29 19:23:09 +01:00
Merge branch 'master' into 4.0
This commit is contained in:
commit
cdc0df26bb
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
@ -74,10 +74,10 @@ configure_db_mysql() {
|
||||
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
|
||||
echo "** Instaling initial MySQL database schemas"
|
||||
echo "** Installing initial MySQL database schemas"
|
||||
mysql_install_db --user=mysql 2>&1 1>/dev/null
|
||||
else
|
||||
echo "**** MySQL data directory is not empty. Using already existsing installation."
|
||||
echo "**** MySQL data directory is not empty. Using already existing installation."
|
||||
chown -R mysql:mysql "$MYSQL_DATA_DIR"
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user