diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index a6b47f091..e702c9129 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -58,6 +58,8 @@ RUN apk update && \ --with-openssl && \ make -j"$(nproc)" -s 1>/dev/null && \ cp src/zabbix_agent/zabbix_agentd /usr/sbin/zabbix_agentd && \ + cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ + cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ cp conf/zabbix_agentd.conf /etc/zabbix && \ chown --quiet -R zabbix:root /etc/zabbix && \ cd /tmp/ && \ diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 3d3ab674f..3aaa05fc0 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -64,6 +64,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ --with-openssl && \ make -j"$(nproc)" -s 1>/dev/null && \ cp src/zabbix_agent/zabbix_agentd /usr/sbin/zabbix_agentd && \ + cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ + cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ cp conf/zabbix_agentd.conf /etc/zabbix/ && \ chown --quiet -R zabbix:root /etc/zabbix && \ cd /tmp/ && \ diff --git a/docker-compose_v2_alpine_mysql_latest.yaml b/docker-compose_v2_alpine_mysql_latest.yaml index 283b1151e..35614e856 100644 --- a/docker-compose_v2_alpine_mysql_latest.yaml +++ b/docker-compose_v2_alpine_mysql_latest.yaml @@ -252,6 +252,7 @@ services: mysql-server: image: mysql:5.7 + command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] volumes_from: - db_data_mysql volume_driver: local diff --git a/docker-compose_v2_alpine_mysql_local.yaml b/docker-compose_v2_alpine_mysql_local.yaml index d5e25a8ac..3de23c994 100644 --- a/docker-compose_v2_alpine_mysql_local.yaml +++ b/docker-compose_v2_alpine_mysql_local.yaml @@ -260,6 +260,7 @@ services: mysql-server: image: mysql:5.7 + command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] volumes_from: - db_data_mysql volume_driver: local diff --git a/docker-compose_v2_alpine_pgsql_latest.yaml b/docker-compose_v2_alpine_pgsql_latest.yaml index 12dc12a72..93de34b97 100644 --- a/docker-compose_v2_alpine_pgsql_latest.yaml +++ b/docker-compose_v2_alpine_pgsql_latest.yaml @@ -252,6 +252,7 @@ services: mysql-server: image: mysql:5.7 + command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] volumes_from: - db_data_mysql volume_driver: local diff --git a/docker-compose_v2_alpine_pgsql_local.yaml b/docker-compose_v2_alpine_pgsql_local.yaml index 982704230..dd27fbd3f 100644 --- a/docker-compose_v2_alpine_pgsql_local.yaml +++ b/docker-compose_v2_alpine_pgsql_local.yaml @@ -261,6 +261,7 @@ services: mysql-server: image: mysql:5.7 + command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] volumes_from: - db_data_mysql volume_driver: local diff --git a/docker-compose_v2_ubuntu_mysql_latest.yaml b/docker-compose_v2_ubuntu_mysql_latest.yaml index ff89b389f..0d276ea45 100644 --- a/docker-compose_v2_ubuntu_mysql_latest.yaml +++ b/docker-compose_v2_ubuntu_mysql_latest.yaml @@ -253,6 +253,7 @@ services: mysql-server: image: mysql:5.7 + command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] volumes_from: - db_data_mysql volume_driver: local diff --git a/docker-compose_v2_ubuntu_mysql_local.yaml b/docker-compose_v2_ubuntu_mysql_local.yaml index 00a56951e..a52addddd 100644 --- a/docker-compose_v2_ubuntu_mysql_local.yaml +++ b/docker-compose_v2_ubuntu_mysql_local.yaml @@ -261,6 +261,7 @@ services: mysql-server: image: mysql:5.7 + command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] volumes_from: - db_data_mysql volume_driver: local diff --git a/docker-compose_v2_ubuntu_pgsql_latest.yaml b/docker-compose_v2_ubuntu_pgsql_latest.yaml index 8f8597cf2..4d009f338 100644 --- a/docker-compose_v2_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v2_ubuntu_pgsql_latest.yaml @@ -252,6 +252,7 @@ services: mysql-server: image: mysql:5.7 + command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] volumes_from: - db_data_mysql volume_driver: local diff --git a/docker-compose_v2_ubuntu_pgsql_local.yaml b/docker-compose_v2_ubuntu_pgsql_local.yaml index bd68a59b0..33caa267f 100644 --- a/docker-compose_v2_ubuntu_pgsql_local.yaml +++ b/docker-compose_v2_ubuntu_pgsql_local.yaml @@ -260,6 +260,7 @@ services: mysql-server: image: mysql:5.7 + command: [mysqld, --character-set-server=utf8, --collation-server=utf8_bin] volumes_from: - db_data_mysql volume_driver: local diff --git a/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index bda42fd5d..93cd7aea2 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/alpine/Dockerfile @@ -96,6 +96,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ make -j"$(nproc)" -s dbschema 1>/dev/null && \ make -j"$(nproc)" -s 1>/dev/null && \ cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \ + cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ + cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ cp conf/zabbix_proxy.conf /etc/zabbix/zabbix_proxy.conf && \ chown --quiet -R zabbix:root /etc/zabbix && \ cp database/${DB_TYPE}/schema.sql /usr/share/doc/zabbix-proxy-${DB_TYPE}/ && \ diff --git a/proxy-mysql/alpine/build.sh b/proxy-mysql/alpine/build.sh index 6354627de..f24c516e6 100755 --- a/proxy-mysql/alpine/build.sh +++ b/proxy-mysql/alpine/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component-$app_database:$os-$version diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 557da78c6..feca5dea8 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -102,6 +102,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ make -j"$(nproc)" -s dbschema 1>/dev/null && \ make -j"$(nproc)" -s 1>/dev/null && \ cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \ + cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ + cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ cp conf/zabbix_proxy.conf /etc/zabbix/zabbix_proxy.conf && \ chown --quiet -R zabbix:root /etc/zabbix && \ cp database/${DB_TYPE}/schema.sql /usr/share/doc/zabbix-proxy-${DB_TYPE}/ && \ diff --git a/proxy-mysql/ubuntu/build.sh b/proxy-mysql/ubuntu/build.sh index fbf7add8f..717d2f852 100755 --- a/proxy-mysql/ubuntu/build.sh +++ b/proxy-mysql/ubuntu/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component-$app_database:$os-$version \ No newline at end of file diff --git a/proxy-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 9ef510f9a..a51730c4c 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -92,6 +92,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ make -j"$(nproc)" -s dbschema 1>/dev/null && \ make -j"$(nproc)" -s 1>/dev/null && \ cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \ + cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ + cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ cp conf/zabbix_proxy.conf /etc/zabbix/zabbix_proxy.conf && \ chown --quiet -R zabbix:root /etc/zabbix && \ cd /tmp/ && \ diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index 2db7f196d..b9bed6602 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -100,6 +100,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ make -j"$(nproc)" -s dbschema 1>/dev/null && \ make -j"$(nproc)" -s 1>/dev/null && \ cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \ + cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ + cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ cp conf/zabbix_proxy.conf /etc/zabbix/zabbix_proxy.conf && \ chown --quiet -R zabbix:root /etc/zabbix && \ cd /tmp/ && \ diff --git a/server-mysql/alpine/Dockerfile b/server-mysql/alpine/Dockerfile index 267f1e382..8ef31d5b5 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -97,6 +97,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ make -j"$(nproc)" -s dbschema 1>/dev/null && \ make -j"$(nproc)" -s 1>/dev/null && \ cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \ + cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ + cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ cp conf/zabbix_server.conf /etc/zabbix/zabbix_server.conf && \ chown --quiet -R zabbix:root /etc/zabbix && \ cp database/${DB_TYPE}/schema.sql /usr/share/doc/zabbix-server-${DB_TYPE}/ && \ diff --git a/server-mysql/alpine/build.sh b/server-mysql/alpine/build.sh index 774e15d18..f53753010 100755 --- a/server-mysql/alpine/build.sh +++ b/server-mysql/alpine/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql zabbix-$app_component-$app_database:$os-$version diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index e81595364..4d4818114 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -103,6 +103,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ make -j"$(nproc)" -s dbschema 1>/dev/null && \ make -j"$(nproc)" -s 1>/dev/null && \ cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \ + cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ + cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ cp conf/zabbix_server.conf /etc/zabbix && \ chown --quiet -R zabbix:root /etc/zabbix && \ cp database/${DB_TYPE}/schema.sql /usr/share/doc/zabbix-server-${DB_TYPE}/ && \ diff --git a/server-mysql/ubuntu/build.sh b/server-mysql/ubuntu/build.sh index 89bf78c34..92aeff067 100755 --- a/server-mysql/ubuntu/build.sh +++ b/server-mysql/ubuntu/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql zabbix-$app_component-$app_database:$os-$version diff --git a/server-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 1a1408d15..d73215be5 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -97,6 +97,8 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ make -j"$(nproc)" -s dbschema 1>/dev/null && \ make -j"$(nproc)" -s 1>/dev/null && \ cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \ + cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ + cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ cp conf/zabbix_server.conf /etc/zabbix/zabbix_server.conf && \ chown --quiet -R zabbix:root /etc/zabbix && \ cp database/${DB_TYPE}/schema.sql /usr/share/doc/zabbix-server-${DB_TYPE}/ && \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 0152d5642..1b27d2513 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -103,6 +103,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ make -j"$(nproc)" -s dbschema 1>/dev/null && \ make -j"$(nproc)" -s 1>/dev/null && \ cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \ + cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \ + cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \ cp conf/zabbix_server.conf /etc/zabbix/zabbix_server.conf && \ chown --quiet -R zabbix:root /etc/zabbix && \ cp database/${DB_TYPE}/schema.sql /usr/share/doc/zabbix-server-${DB_TYPE}/ && \ diff --git a/web-apache-mysql/alpine/build.sh b/web-apache-mysql/alpine/build.sh index ef070ac25..3c80c7493 100755 --- a/web-apache-mysql/alpine/build.sh +++ b/web-apache-mysql/alpine/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component-$app_database:$os-$version diff --git a/web-apache-mysql/ubuntu/build.sh b/web-apache-mysql/ubuntu/build.sh index 5b0060a52..8bb26e15d 100755 --- a/web-apache-mysql/ubuntu/build.sh +++ b/web-apache-mysql/ubuntu/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component-$app_database:$os-$version diff --git a/web-nginx-mysql/alpine/build.sh b/web-nginx-mysql/alpine/build.sh index 7c7856d39..312a13f50 100755 --- a/web-nginx-mysql/alpine/build.sh +++ b/web-nginx-mysql/alpine/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component-$app_database:$os-$version diff --git a/web-nginx-mysql/ubuntu/build.sh b/web-nginx-mysql/ubuntu/build.sh index 41b8efad0..3831fd2ed 100755 --- a/web-nginx-mysql/ubuntu/build.sh +++ b/web-nginx-mysql/ubuntu/build.sh @@ -18,6 +18,6 @@ docker build -t zabbix-$app_component-$app_database:$os-$version -f Dockerfile . #docker rm -f zabbix-$app_component-$app_database #docker rm -f mysql-server -#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 +#docker run --name mysql-server -t -e MYSQL_DATABASE="zabbix" -e MYSQL_USER="zabbix" -e MYSQL_PASSWORD="zabbix" -e MYSQL_RANDOM_ROOT_PASSWORD=true -d mysql:5.7 --character-set-server=utf8 --collation-server=utf8_bin #sleep 5 #docker run --name zabbix-$app_component-$app_database -t -d --link mysql-server:mysql --link zabbix-server:zabbix-server zabbix-$app_component-$app_database:$os-$version