From ca3d5f38a15aea073cec149996462b1ae124f681 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Oct 2017 17:51:54 +0300 Subject: [PATCH 1/4] Fixed issue with non UTF-8 symbols on MySQL --- docker-compose_v2_alpine_mysql_latest.yaml | 1 + docker-compose_v2_alpine_mysql_local.yaml | 1 + docker-compose_v2_ubuntu_mysql_latest.yaml | 1 + docker-compose_v2_ubuntu_mysql_local.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/docker-compose_v2_alpine_mysql_latest.yaml b/docker-compose_v2_alpine_mysql_latest.yaml index d9e9c0f38..05a65dcb0 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_ubuntu_mysql_latest.yaml b/docker-compose_v2_ubuntu_mysql_latest.yaml index b82b5c318..70e2b34bc 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 From d249584c992db9df6c903465f5a54767100ad60f Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Oct 2017 18:01:12 +0300 Subject: [PATCH 2/4] Fixed issue with non UTF-8 symbols on MySQL for proxies --- docker-compose_v2_alpine_pgsql_latest.yaml | 1 + docker-compose_v2_alpine_pgsql_local.yaml | 1 + docker-compose_v2_ubuntu_pgsql_latest.yaml | 1 + docker-compose_v2_ubuntu_pgsql_local.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/docker-compose_v2_alpine_pgsql_latest.yaml b/docker-compose_v2_alpine_pgsql_latest.yaml index f2bd0f39d..39ede361f 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_pgsql_latest.yaml b/docker-compose_v2_ubuntu_pgsql_latest.yaml index dcbbd313b..713a2e4f1 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 From a7d9831ebf6f60ac1707ad0d119ca4f70283e9b2 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Oct 2017 18:06:22 +0300 Subject: [PATCH 3/4] Fixed issue with non UTF-8 symbols in build scripts --- proxy-mysql/alpine/build.sh | 2 +- proxy-mysql/ubuntu/build.sh | 2 +- server-mysql/alpine/build.sh | 2 +- server-mysql/ubuntu/build.sh | 2 +- web-apache-mysql/alpine/build.sh | 2 +- web-apache-mysql/ubuntu/build.sh | 2 +- web-nginx-mysql/alpine/build.sh | 2 +- web-nginx-mysql/ubuntu/build.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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/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/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/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/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 From 269de962ecb38bd1b7a5361d7b0ce74c15976378 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 21 Oct 2017 17:06:05 +0300 Subject: [PATCH 4/4] Added zabbix_get and zabbix_sender utilities to agent, proxy and server containers --- agent/alpine/Dockerfile | 2 ++ agent/ubuntu/Dockerfile | 2 ++ proxy-mysql/alpine/Dockerfile | 2 ++ proxy-mysql/ubuntu/Dockerfile | 2 ++ proxy-sqlite3/alpine/Dockerfile | 2 ++ proxy-sqlite3/ubuntu/Dockerfile | 2 ++ server-mysql/alpine/Dockerfile | 2 ++ server-mysql/ubuntu/Dockerfile | 2 ++ server-pgsql/alpine/Dockerfile | 2 ++ server-pgsql/ubuntu/Dockerfile | 2 ++ 10 files changed, 20 insertions(+) diff --git a/agent/alpine/Dockerfile b/agent/alpine/Dockerfile index 3e0fa0b06..c323bebe0 100644 --- a/agent/alpine/Dockerfile +++ b/agent/alpine/Dockerfile @@ -56,6 +56,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 f18d0ad8e..b36bc78a3 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -62,6 +62,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/proxy-mysql/alpine/Dockerfile b/proxy-mysql/alpine/Dockerfile index bd066970a..6db5478ff 100644 --- a/proxy-mysql/alpine/Dockerfile +++ b/proxy-mysql/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 && \ cp database/${DB_TYPE}/schema.sql /usr/share/doc/zabbix-proxy-${DB_TYPE}/ && \ diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index a17e53a7f..131ffa963 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -98,6 +98,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-sqlite3/alpine/Dockerfile b/proxy-sqlite3/alpine/Dockerfile index 181d3064c..7ccab6e08 100644 --- a/proxy-sqlite3/alpine/Dockerfile +++ b/proxy-sqlite3/alpine/Dockerfile @@ -88,6 +88,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 ee5b9d953..71037c39f 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -96,6 +96,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 f522d283f..943e8ed18 100644 --- a/server-mysql/alpine/Dockerfile +++ b/server-mysql/alpine/Dockerfile @@ -93,6 +93,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/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index f01cedd69..aa8c00b4b 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -99,6 +99,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-pgsql/alpine/Dockerfile b/server-pgsql/alpine/Dockerfile index 78de837da..67cdb8ea9 100644 --- a/server-pgsql/alpine/Dockerfile +++ b/server-pgsql/alpine/Dockerfile @@ -93,6 +93,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 ceaee76ed..29b2aeb60 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -99,6 +99,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}/ && \