extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-14 20:04:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #152 from zabbix/master

Browse Source 
Master
This commit is contained in:
Alexey Pustovalov 2017-10-21 17:16:14 +03:00 committed by GitHub
commit 972ddcd67a
26 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/alpine/Dockerfile
View File

@ -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/ && \

2
agent/ubuntu/Dockerfile
View File

@ -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/ && \

1
docker-compose_v2_alpine_mysql_latest.yaml
View File

@ -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

1
docker-compose_v2_alpine_mysql_local.yaml
View File

@ -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

1
docker-compose_v2_alpine_pgsql_latest.yaml
View File

@ -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

1
docker-compose_v2_alpine_pgsql_local.yaml
View File

@ -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

1
docker-compose_v2_ubuntu_mysql_latest.yaml
View File

@ -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

1
docker-compose_v2_ubuntu_mysql_local.yaml
View File

@ -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

1
docker-compose_v2_ubuntu_pgsql_latest.yaml
View File

@ -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

1
docker-compose_v2_ubuntu_pgsql_local.yaml
View File

@ -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

2
proxy-mysql/alpine/Dockerfile
View File

@ -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}/ && \

2
proxy-mysql/alpine/build.sh
View File

@ -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

2
proxy-mysql/ubuntu/Dockerfile
View File

@ -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}/ && \

2
proxy-mysql/ubuntu/build.sh
View File

@ -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

2
proxy-sqlite3/alpine/Dockerfile
View File

@ -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/ && \

2
proxy-sqlite3/ubuntu/Dockerfile
View File

@ -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/ && \

2
server-mysql/alpine/Dockerfile
View File

@ -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}/ && \

2
server-mysql/alpine/build.sh
View File

@ -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

2
server-mysql/ubuntu/Dockerfile
View File

@ -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}/ && \

2
server-mysql/ubuntu/build.sh
View File

@ -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

2
server-pgsql/alpine/Dockerfile
View File

@ -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}/ && \

2
server-pgsql/ubuntu/Dockerfile
View File

@ -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}/ && \

2
web-apache-mysql/alpine/build.sh
View File

@ -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

2
web-apache-mysql/ubuntu/build.sh
View File

@ -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

2
web-nginx-mysql/alpine/build.sh
View File

@ -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

2
web-nginx-mysql/ubuntu/build.sh
View File

@ -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