extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-09 16:45:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154 from zabbix/master

Browse Source 
Master
This commit is contained in:
Alexey Pustovalov
2017-10-21 17:17:10 +03:00
committed by GitHub
parent 09a338f782 269de962ec
commit db0db59d0a
26 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server-mysql/alpine/Dockerfile
View File

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

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