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} \
apache2 \
bash \
curl \
mariadb-client \
mariadb-client-libs \
php7-apache2 \

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -70,6 +70,7 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
yum ${YUM_FLAGS_PERSISTENT} install \
dejavu-sans-fonts \
curl \
mariadb \
nginx \
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 && \
apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTENT} install \
curl \
mysql-client \
nginx \
php5-fpm \

View File

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

View File

@ -70,6 +70,7 @@ RUN groupadd --system zabbix && \
yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
yum ${YUM_FLAGS_PERSISTENT} install supervisor \
dejavu-sans-fonts \
curl \
nginx \
postgresql \
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 && \
apt-get ${APT_FLAGS_COMMON} update && \
apt-get ${APT_FLAGS_PERSISTENT} install \
curl \
nginx \
php5-fpm \
php5-gd \