extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-04-16 15:28:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed schema and initial data client charset for MySQL based images

Browse Source
This commit is contained in:
Alexey Pustovalov 2022-02-09 19:05:29 +05:00
parent 7d8b42149c
commit 65f1fd4fc9
11 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
View File

@ -294,6 +294,7 @@ create_db_schema_mysql() {
export MYSQL_PWD="${DB_SERVER_ROOT_PASS}" export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"
zcat /usr/share/doc/zabbix-proxy-mysql/create.sql.gz | mysql --silent --skip-column-names \ zcat /usr/share/doc/zabbix-proxy-mysql/create.sql.gz | mysql --silent --skip-column-names \
--default-character-set=utf8mb4 \
-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \ -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-u ${DB_SERVER_ROOT_USER} $ssl_opts \ -u ${DB_SERVER_ROOT_USER} $ssl_opts \
${DB_SERVER_DBNAME} 1>/dev/null ${DB_SERVER_DBNAME} 1>/dev/null

1
Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
View File

@ -292,6 +292,7 @@ create_db_schema_mysql() {
export MYSQL_PWD="${DB_SERVER_ROOT_PASS}" export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"
zcat /usr/share/doc/zabbix-proxy-mysql/create.sql.gz | mysql --silent --skip-column-names \ zcat /usr/share/doc/zabbix-proxy-mysql/create.sql.gz | mysql --silent --skip-column-names \
--default-character-set=utf8mb4 \
-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \ -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-u ${DB_SERVER_ROOT_USER} $ssl_opts \ -u ${DB_SERVER_ROOT_USER} $ssl_opts \
${DB_SERVER_DBNAME} 1>/dev/null ${DB_SERVER_DBNAME} 1>/dev/null

1
Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
View File

@ -292,6 +292,7 @@ create_db_schema_mysql() {
export MYSQL_PWD="${DB_SERVER_ROOT_PASS}" export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"
zcat /usr/share/doc/zabbix-proxy-mysql/create.sql.gz | mysql --silent --skip-column-names \ zcat /usr/share/doc/zabbix-proxy-mysql/create.sql.gz | mysql --silent --skip-column-names \
--default-character-set=utf8mb4 \
-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \ -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-u ${DB_SERVER_ROOT_USER} $ssl_opts \ -u ${DB_SERVER_ROOT_USER} $ssl_opts \
${DB_SERVER_DBNAME} 1>/dev/null ${DB_SERVER_DBNAME} 1>/dev/null

1
Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
View File

@ -293,6 +293,7 @@ create_db_schema_mysql() {
export MYSQL_PWD="${DB_SERVER_ROOT_PASS}" export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"
zcat /usr/share/doc/zabbix-proxy-mysql/create.sql.gz | mysql --silent --skip-column-names \ zcat /usr/share/doc/zabbix-proxy-mysql/create.sql.gz | mysql --silent --skip-column-names \
--default-character-set=utf8mb4 \
-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \ -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-u ${DB_SERVER_ROOT_USER} $ssl_opts \ -u ${DB_SERVER_ROOT_USER} $ssl_opts \
${DB_SERVER_DBNAME} 1>/dev/null ${DB_SERVER_DBNAME} 1>/dev/null

1
Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
View File

@ -291,6 +291,7 @@ create_db_schema_mysql() {
export MYSQL_PWD="${DB_SERVER_ROOT_PASS}" export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"
zcat /usr/share/doc/zabbix-proxy-mysql/create.sql.gz | mysql --silent --skip-column-names \ zcat /usr/share/doc/zabbix-proxy-mysql/create.sql.gz | mysql --silent --skip-column-names \
--default-character-set=utf8mb4 \
-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \ -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-u ${DB_SERVER_ROOT_USER} $ssl_opts \ -u ${DB_SERVER_ROOT_USER} $ssl_opts \
${DB_SERVER_DBNAME} 1>/dev/null ${DB_SERVER_DBNAME} 1>/dev/null

1
Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
View File

@ -289,6 +289,7 @@ create_db_schema_mysql() {
export MYSQL_PWD="${DB_SERVER_ROOT_PASS}" export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"
zcat /usr/share/doc/zabbix-server-mysql/create.sql.gz | mysql --silent --skip-column-names \ zcat /usr/share/doc/zabbix-server-mysql/create.sql.gz | mysql --silent --skip-column-names \
--default-character-set=utf8mb4 \
-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \ -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-u ${DB_SERVER_ROOT_USER} $ssl_opts \ -u ${DB_SERVER_ROOT_USER} $ssl_opts \
${DB_SERVER_DBNAME} 1>/dev/null ${DB_SERVER_DBNAME} 1>/dev/null

1
Dockerfiles/server-mysql/centos/docker-entrypoint.sh
View File

@ -286,6 +286,7 @@ create_db_schema_mysql() {
export MYSQL_PWD="${DB_SERVER_ROOT_PASS}" export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"
zcat /usr/share/doc/zabbix-server-mysql/create.sql.gz | mysql --silent --skip-column-names \ zcat /usr/share/doc/zabbix-server-mysql/create.sql.gz | mysql --silent --skip-column-names \
--default-character-set=utf8mb4 \
-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \ -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-u ${DB_SERVER_ROOT_USER} $ssl_opts \ -u ${DB_SERVER_ROOT_USER} $ssl_opts \
${DB_SERVER_DBNAME} 1>/dev/null ${DB_SERVER_DBNAME} 1>/dev/null

1
Dockerfiles/server-mysql/ol/docker-entrypoint.sh
View File

@ -286,6 +286,7 @@ create_db_schema_mysql() {
export MYSQL_PWD="${DB_SERVER_ROOT_PASS}" export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"
zcat /usr/share/doc/zabbix-server-mysql/create.sql.gz | mysql --silent --skip-column-names \ zcat /usr/share/doc/zabbix-server-mysql/create.sql.gz | mysql --silent --skip-column-names \
--default-character-set=utf8mb4 \
-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \ -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-u ${DB_SERVER_ROOT_USER} $ssl_opts \ -u ${DB_SERVER_ROOT_USER} $ssl_opts \
${DB_SERVER_DBNAME} 1>/dev/null ${DB_SERVER_DBNAME} 1>/dev/null

1
Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
View File

@ -286,6 +286,7 @@ create_db_schema_mysql() {
export MYSQL_PWD="${DB_SERVER_ROOT_PASS}" export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"
zcat /usr/share/doc/zabbix-server-mysql/create.sql.gz | mysql --silent --skip-column-names \ zcat /usr/share/doc/zabbix-server-mysql/create.sql.gz | mysql --silent --skip-column-names \
--default-character-set=utf8mb4 \
-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \ -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-u ${DB_SERVER_ROOT_USER} $ssl_opts \ -u ${DB_SERVER_ROOT_USER} $ssl_opts \
${DB_SERVER_DBNAME} 1>/dev/null ${DB_SERVER_DBNAME} 1>/dev/null

1
Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
View File

@ -286,6 +286,7 @@ create_db_schema_mysql() {
export MYSQL_PWD="${DB_SERVER_ROOT_PASS}" export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"
zcat /usr/share/doc/zabbix-server-mysql/create.sql.gz | mysql --silent --skip-column-names \ zcat /usr/share/doc/zabbix-server-mysql/create.sql.gz | mysql --silent --skip-column-names \
--default-character-set=utf8mb4 \
-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \ -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-u ${DB_SERVER_ROOT_USER} $ssl_opts \ -u ${DB_SERVER_ROOT_USER} $ssl_opts \
${DB_SERVER_DBNAME} 1>/dev/null ${DB_SERVER_DBNAME} 1>/dev/null

1
Dockerfiles/zabbix-appliance/rhel/docker-entrypoint.sh
View File

@ -336,6 +336,7 @@ create_db_schema_mysql() {
ssl_opts="$(db_tls_params)" ssl_opts="$(db_tls_params)"
zcat /usr/share/doc/zabbix-server-mysql/create.sql.gz | mysql --silent --skip-column-names \ zcat /usr/share/doc/zabbix-server-mysql/create.sql.gz | mysql --silent --skip-column-names \
--default-character-set=utf8mb4 \
-h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \ -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-u ${DB_SERVER_ROOT_USER} --password="${DB_SERVER_ROOT_PASS}" $ssl_opts \ -u ${DB_SERVER_ROOT_USER} --password="${DB_SERVER_ROOT_PASS}" $ssl_opts \
${DB_SERVER_DBNAME} 1>/dev/null ${DB_SERVER_DBNAME} 1>/dev/null