From 59f14d89cb630b8d99941575a6f34ab5c8ba1b04 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 6 Jul 2018 15:54:10 +0900 Subject: [PATCH] Fixed health check in docker compose files --- web-apache-mysql/alpine/Dockerfile | 1 + web-apache-mysql/centos/Dockerfile | 1 + web-apache-mysql/ubuntu/Dockerfile | 1 + web-apache-pgsql/alpine/Dockerfile | 1 + web-apache-pgsql/centos/Dockerfile | 1 + web-apache-pgsql/ubuntu/Dockerfile | 1 + web-nginx-mysql/alpine/Dockerfile | 1 + web-nginx-mysql/centos/Dockerfile | 1 + web-nginx-mysql/ubuntu/Dockerfile | 1 + web-nginx-pgsql/alpine/Dockerfile | 1 + web-nginx-pgsql/centos/Dockerfile | 1 + web-nginx-pgsql/ubuntu/Dockerfile | 1 + 12 files changed, 12 insertions(+) diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index c3b7a1c0f..d211111a9 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -34,6 +34,7 @@ RUN addgroup zabbix && \ apk add ${APK_FLAGS_PERSISTENT} \ apache2 \ bash \ + curl \ mariadb-client \ mariadb-client-libs \ php7-apache2 \ diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index a4f209af7..6b70c8206 100644 --- a/web-apache-mysql/centos/Dockerfile +++ b/web-apache-mysql/centos/Dockerfile @@ -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 \ diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 224192ecb..583867ea4 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -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 \ diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index 8a7e186d0..e3bdd99ca 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -34,6 +34,7 @@ RUN addgroup zabbix && \ apk add ${APK_FLAGS_PERSISTENT} \ apache2 \ bash \ + curl \ php7-apache2 \ php7-bcmath \ php7-ctype \ diff --git a/web-apache-pgsql/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index 1996adf33..3462e368a 100644 --- a/web-apache-pgsql/centos/Dockerfile +++ b/web-apache-pgsql/centos/Dockerfile @@ -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 \ diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 20c4a6312..a58309186 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -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 \ diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 95d880747..08a8a4e75 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -33,6 +33,7 @@ RUN addgroup zabbix && \ apk update && \ apk add ${APK_FLAGS_PERSISTENT} \ bash \ + curl \ mariadb-client \ mariadb-client-libs \ nginx \ diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index c9391f0ea..0fa793a84 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -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 \ diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index 511dff11b..c514ee036 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -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 \ diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index f644556ef..3ac89d29c 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -33,6 +33,7 @@ RUN addgroup zabbix && \ apk update && \ apk add ${APK_FLAGS_PERSISTENT} \ bash \ + curl \ nginx \ php7-bcmath \ php7-ctype \ diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index 45cb0c779..737a05a73 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -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 \ diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index 668f11693..070f3bbab 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -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 \