Updated Alpine images

This commit is contained in:
Alexey Pustovalov
2020-04-25 22:34:09 +03:00
parent c4b8ddfbe2
commit ab2a7ab304
16 changed files with 140 additions and 989 deletions

View File

@ -4,7 +4,7 @@ LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
org.opencontainers.image.vendor="Zabbix LLC" \
org.opencontainers.image.url="https://zabbix.com/" \
org.opencontainers.image.description="abbix web-interface based on Nginx web server with MySQL database support" \
org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with MySQL database support" \
org.opencontainers.image.licenses="GPL v2.0"
STOPSIGNAL SIGTERM

View File

@ -145,8 +145,7 @@ update_config_multiple_var() {
}
# Check prerequisites for MySQL database
check_variables_mysql() {
local type=$1
check_variables() {
DB_SERVER_HOST=${DB_SERVER_HOST:-"mysql-server"}
DB_SERVER_PORT=${DB_SERVER_PORT:-"3306"}
@ -155,9 +154,7 @@ check_variables_mysql() {
file_env MYSQL_USER
file_env MYSQL_PASSWORD
if [ "$type" != "" ]; then
file_env MYSQL_ROOT_PASSWORD
fi
file_env MYSQL_ROOT_PASSWORD
if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then
echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password"
@ -288,7 +285,7 @@ prepare_zbx_web_config() {
prepare_web() {
echo "** Preparing Zabbix web-interface"
check_variables_mysql
check_variables
check_db_connect
prepare_web_server
prepare_zbx_web_config