extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-01 15:47:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into trunk

Browse Source
This commit is contained in:
Alexey Pustovalov 2019-11-01 02:01:29 +02:00
commit 45f9fa03d8
12 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web-nginx-mysql/alpine/Dockerfile
View File

@ -54,6 +54,7 @@ RUN set -eux && \
php7-xmlreader \ php7-xmlreader \
php7-xmlwriter \ php7-xmlwriter \
supervisor && \ supervisor && \
rm -f /etc/nginx/conf.d/*.conf && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=4.4 ARG MAJOR_VERSION=4.4

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

@ -638,9 +638,6 @@ prepare_web_server_nginx() {
NGINX_SSL_CONFIG="/etc/ssl/nginx" NGINX_SSL_CONFIG="/etc/ssl/nginx"
PHP_SESSIONS_DIR="/var/lib/php5" PHP_SESSIONS_DIR="/var/lib/php5"
echo "** Disable default vhosts"
rm -f $NGINX_CONFD_DIR/*.conf
echo "** Adding Zabbix virtual host (HTTP)" echo "** Adding Zabbix virtual host (HTTP)"
if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR" ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR"

1
web-nginx-mysql/centos/Dockerfile
View File

@ -80,6 +80,7 @@ RUN set -eux && \
php-mysql \ php-mysql \
php-xml \ php-xml \
supervisor && \ supervisor && \
rm -f /etc/nginx/conf.d/*.conf && \
cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
cut -d"'" -f 2 | sort | \ cut -d"'" -f 2 | sort | \
xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \

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

@ -638,9 +638,6 @@ prepare_web_server_nginx() {
NGINX_SSL_CONFIG="/etc/ssl/nginx" NGINX_SSL_CONFIG="/etc/ssl/nginx"
PHP_SESSIONS_DIR="/var/lib/php5" PHP_SESSIONS_DIR="/var/lib/php5"
echo "** Disable default vhosts"
rm -f $NGINX_CONFD_DIR/*.conf
echo "** Adding Zabbix virtual host (HTTP)" echo "** Adding Zabbix virtual host (HTTP)"
if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR" ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR"

1
web-nginx-mysql/ubuntu/Dockerfile
View File

@ -65,6 +65,7 @@ RUN set -eux && \
php7.2-mysql \ php7.2-mysql \
php7.2-xml \ php7.2-xml \
supervisor && \ supervisor && \
rm -f /etc/nginx/conf.d/*.conf && \
DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \ DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
wget && \ wget && \
apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} autoremove && \

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

@ -638,9 +638,6 @@ prepare_web_server_nginx() {
NGINX_SSL_CONFIG="/etc/ssl/nginx" NGINX_SSL_CONFIG="/etc/ssl/nginx"
PHP_SESSIONS_DIR="/var/lib/php5" PHP_SESSIONS_DIR="/var/lib/php5"
echo "** Disable default vhosts"
rm -f $NGINX_CONFD_DIR/*.conf
echo "** Adding Zabbix virtual host (HTTP)" echo "** Adding Zabbix virtual host (HTTP)"
if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR" ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR"

1
web-nginx-pgsql/alpine/Dockerfile
View File

@ -53,6 +53,7 @@ RUN set -eux && \
php7-xmlwriter \ php7-xmlwriter \
postgresql-client \ postgresql-client \
supervisor && \ supervisor && \
rm -f /etc/nginx/conf.d/*.conf && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=4.4 ARG MAJOR_VERSION=4.4

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

@ -638,9 +638,6 @@ prepare_web_server_nginx() {
NGINX_SSL_CONFIG="/etc/ssl/nginx" NGINX_SSL_CONFIG="/etc/ssl/nginx"
PHP_SESSIONS_DIR="/var/lib/php5" PHP_SESSIONS_DIR="/var/lib/php5"
echo "** Disable default vhosts"
rm -f $NGINX_CONFD_DIR/*.conf
echo "** Adding Zabbix virtual host (HTTP)" echo "** Adding Zabbix virtual host (HTTP)"
if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR" ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR"

1
web-nginx-pgsql/centos/Dockerfile
View File

@ -78,6 +78,7 @@ RUN set -eux && \
php-mbstring \ php-mbstring \
php-pgsql \ php-pgsql \
php-xml && \ php-xml && \
rm -f /etc/nginx/conf.d/*.conf && \
cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
cut -d"'" -f 2 | sort | \ cut -d"'" -f 2 | sort | \
xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \

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

@ -630,9 +630,6 @@ prepare_web_server_nginx() {
NGINX_SSL_CONFIG="/etc/ssl/nginx" NGINX_SSL_CONFIG="/etc/ssl/nginx"
PHP_SESSIONS_DIR="/var/lib/php5" PHP_SESSIONS_DIR="/var/lib/php5"
echo "** Disable default vhosts"
rm -f $NGINX_CONFD_DIR/*.conf
echo "** Adding Zabbix virtual host (HTTP)" echo "** Adding Zabbix virtual host (HTTP)"
if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR" ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR"

1
web-nginx-pgsql/ubuntu/Dockerfile
View File

@ -65,6 +65,7 @@ RUN set -eux && \
php7.2-pgsql \ php7.2-pgsql \
postgresql-client \ postgresql-client \
supervisor && \ supervisor && \
rm -f /etc/nginx/conf.d/*.conf && \
DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \ DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
wget && \ wget && \
apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} autoremove && \

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

@ -630,9 +630,6 @@ prepare_web_server_nginx() {
NGINX_SSL_CONFIG="/etc/ssl/nginx" NGINX_SSL_CONFIG="/etc/ssl/nginx"
PHP_SESSIONS_DIR="/var/lib/php5" PHP_SESSIONS_DIR="/var/lib/php5"
echo "** Disable default vhosts"
rm -f $NGINX_CONFD_DIR/*.conf
echo "** Adding Zabbix virtual host (HTTP)" echo "** Adding Zabbix virtual host (HTTP)"
if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR" ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR"