Merge pull request #330 from zabbix/master

Fixed health check in docker compose files
This commit is contained in:
Alexey Pustovalov 2018-07-06 15:54:51 +09:00 committed by GitHub
commit 4af645c4d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 12 additions and 0 deletions

View File

@ -34,6 +34,7 @@ RUN addgroup zabbix && \
apk add ${APK_FLAGS_PERSISTENT} \ apk add ${APK_FLAGS_PERSISTENT} \
apache2 \ apache2 \
bash \ bash \
curl \
mariadb-client \ mariadb-client \
mariadb-client-libs \ mariadb-client-libs \
php7-apache2 \ php7-apache2 \

View File

@ -68,6 +68,7 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_COMMON} makecache && \ yum ${YUM_FLAGS_COMMON} makecache && \
yum ${YUM_FLAGS_PERSISTENT} install \ yum ${YUM_FLAGS_PERSISTENT} install \
dejavu-sans-fonts \ dejavu-sans-fonts \
curl \
httpd \ httpd \
mariadb \ mariadb \
php \ php \

View File

@ -36,6 +36,7 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTENT} install \ apt-get ${APT_FLAGS_PERSISTENT} install \
apache2 \ apache2 \
curl \
libapache2-mod-php5 \ libapache2-mod-php5 \
mysql-client \ mysql-client \
php5-gd \ php5-gd \

View File

@ -34,6 +34,7 @@ RUN addgroup zabbix && \
apk add ${APK_FLAGS_PERSISTENT} \ apk add ${APK_FLAGS_PERSISTENT} \
apache2 \ apache2 \
bash \ bash \
curl \
php7-apache2 \ php7-apache2 \
php7-bcmath \ php7-bcmath \
php7-ctype \ php7-ctype \

View File

@ -69,6 +69,7 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTENT} install epel-release && \ yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
yum ${YUM_FLAGS_PERSISTENT} install \ yum ${YUM_FLAGS_PERSISTENT} install \
dejavu-sans-fonts \ dejavu-sans-fonts \
curl \
httpd \ httpd \
php \ php \
php-bcmath \ php-bcmath \

View File

@ -36,6 +36,7 @@ RUN locale-gen $LC_ALL && \
apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTENT} install \ apt-get ${APT_FLAGS_PERSISTENT} install \
apache2 \ apache2 \
curl \
libapache2-mod-php5 \ libapache2-mod-php5 \
php5-gd \ php5-gd \
php5-json \ php5-json \

View File

@ -33,6 +33,7 @@ RUN addgroup zabbix && \
apk update && \ apk update && \
apk add ${APK_FLAGS_PERSISTENT} \ apk add ${APK_FLAGS_PERSISTENT} \
bash \ bash \
curl \
mariadb-client \ mariadb-client \
mariadb-client-libs \ mariadb-client-libs \
nginx \ nginx \

View File

@ -70,6 +70,7 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTENT} install epel-release && \ yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
yum ${YUM_FLAGS_PERSISTENT} install \ yum ${YUM_FLAGS_PERSISTENT} install \
dejavu-sans-fonts \ dejavu-sans-fonts \
curl \
mariadb \ mariadb \
nginx \ nginx \
php-bcmath \ php-bcmath \

View File

@ -41,6 +41,7 @@ RUN locale-gen $LC_ALL && \
echo "deb http://nginx.org/packages/ubuntu/ $DISTRIB_CODENAME nginx" >> /etc/apt/sources.list.d/nginx.list && \ echo "deb http://nginx.org/packages/ubuntu/ $DISTRIB_CODENAME nginx" >> /etc/apt/sources.list.d/nginx.list && \
apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTENT} install \ apt-get ${APT_FLAGS_PERSISTENT} install \
curl \
mysql-client \ mysql-client \
nginx \ nginx \
php5-fpm \ php5-fpm \

View File

@ -33,6 +33,7 @@ RUN addgroup zabbix && \
apk update && \ apk update && \
apk add ${APK_FLAGS_PERSISTENT} \ apk add ${APK_FLAGS_PERSISTENT} \
bash \ bash \
curl \
nginx \ nginx \
php7-bcmath \ php7-bcmath \
php7-ctype \ php7-ctype \

View File

@ -70,6 +70,7 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTENT} install epel-release && \ yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
yum ${YUM_FLAGS_PERSISTENT} install supervisor \ yum ${YUM_FLAGS_PERSISTENT} install supervisor \
dejavu-sans-fonts \ dejavu-sans-fonts \
curl \
nginx \ nginx \
postgresql \ postgresql \
php-bcmath \ php-bcmath \

View File

@ -41,6 +41,7 @@ RUN locale-gen $LC_ALL && \
echo "deb http://nginx.org/packages/ubuntu/ $DISTRIB_CODENAME nginx" >> /etc/apt/sources.list.d/nginx.list && \ echo "deb http://nginx.org/packages/ubuntu/ $DISTRIB_CODENAME nginx" >> /etc/apt/sources.list.d/nginx.list && \
apt-get ${APT_FLAGS_COMMON} update && \ apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTENT} install \ apt-get ${APT_FLAGS_PERSISTENT} install \
curl \
nginx \ nginx \
php5-fpm \ php5-fpm \
php5-gd \ php5-gd \