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

Merge branch 'master' into trunk

Browse Source
This commit is contained in:
root 2019-01-13 00:26:01 +02:00
commit ef11ec0694
38 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/alpine/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
agent/centos/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
agent/ubuntu/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
java-gateway/alpine/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
java-gateway/centos/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
java-gateway/ubuntu/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
proxy-mysql/alpine/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
proxy-mysql/centos/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
proxy-mysql/ubuntu/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
proxy-sqlite3/alpine/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
proxy-sqlite3/centos/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
proxy-sqlite3/ubuntu/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
server-mysql/alpine/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
server-mysql/centos/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
server-mysql/ubuntu/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
server-pgsql/alpine/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
server-pgsql/centos/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
server-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
web-apache-mysql/alpine/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
web-apache-mysql/centos/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
web-apache-mysql/ubuntu/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
web-apache-pgsql/alpine/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
web-apache-pgsql/centos/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
web-apache-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
web-nginx-mysql/centos/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
web-nginx-mysql/ubuntu/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
web-nginx-pgsql/centos/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

2
web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

1
zabbix-appliance/alpine/Dockerfile
View File

@ -181,6 +181,7 @@ WORKDIR /var/lib/zabbix
VOLUME ["/etc/ssl/nginx"]
VOLUME ["/usr/lib/zabbix/alertscripts", "/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/mibs", "/var/lib/zabbix/modules"]
VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"]
VOLUME ["/var/lib/mysql/"]
COPY ["conf/etc/supervisor/", "/etc/supervisor/"]
COPY ["conf/etc/zabbix/nginx.conf", "/etc/zabbix/"]

2
zabbix-appliance/alpine/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

1
zabbix-appliance/centos/Dockerfile
View File

@ -181,6 +181,7 @@ WORKDIR /var/lib/zabbix
VOLUME ["/etc/ssl/nginx"]
VOLUME ["/usr/lib/zabbix/alertscripts", "/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/mibs", "/var/lib/zabbix/modules"]
VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"]
VOLUME ["/var/lib/mysql/"]
COPY ["conf/etc/supervisor/", "/etc/supervisor/"]
COPY ["conf/etc/zabbix/nginx.conf", "/etc/zabbix/"]

2
zabbix-appliance/centos/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

1
zabbix-appliance/rhel/Dockerfile
View File

@ -207,6 +207,7 @@ WORKDIR /var/lib/zabbix
VOLUME ["/etc/ssl/nginx"]
VOLUME ["/usr/lib/zabbix/alertscripts", "/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/mibs", "/var/lib/zabbix/modules"]
VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"]
VOLUME ["/var/lib/mysql/"]
COPY ["conf/etc/supervisor/", "/etc/supervisor/"]
COPY ["conf/etc/zabbix/nginx.conf", "/etc/zabbix/"]

2
zabbix-appliance/rhel/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"

1
zabbix-appliance/ubuntu/Dockerfile
View File

@ -211,6 +211,7 @@ WORKDIR /var/lib/zabbix
VOLUME ["/etc/ssl/nginx"]
VOLUME ["/usr/lib/zabbix/alertscripts", "/usr/lib/zabbix/externalscripts", "/var/lib/zabbix/enc", "/var/lib/zabbix/mibs", "/var/lib/zabbix/modules"]
VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbix/ssl/keys", "/var/lib/zabbix/ssl/ssl_ca"]
VOLUME ["/var/lib/mysql/"]
COPY ["conf/etc/supervisor/", "/etc/supervisor/"]
COPY ["conf/etc/zabbix/nginx.conf", "/etc/zabbix/"]

2
zabbix-appliance/ubuntu/docker-entrypoint.sh
View File

@ -75,7 +75,7 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null
mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
else
echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR"