extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-25 04:11:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 3.2

Browse Source
This commit is contained in:
root 2018-05-29 22:37:21 -07:00
commit 3ca3fcfe15
4 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
web-apache-mysql/alpine/Dockerfile
View File

@ -33,21 +33,25 @@ RUN addgroup zabbix && \
apk update && \ apk update && \
apk add ${APK_FLAGS_PERSISTANT} \ apk add ${APK_FLAGS_PERSISTANT} \
apache2 \ apache2 \
apache2-ssl \
bash \ bash \
mariadb-client \ mariadb-client \
mariadb-client-libs \ mariadb-client-libs \
php5-apache2 \ php7-apache2 \
php5-bcmath \ php7-bcmath \
php5-ctype \ php7-ctype \
php5-gd \ php7-gd \
php5-gettext \ php7-gettext \
php5-json \ php7-json \
php5-ldap \ php7-ldap \
php5-mysqli \ php7-mbstring \
php5-sockets \ php7-mysqli \
php5-xmlreader \ php7-session \
php7-simplexml \
php7-sockets \
php7-xmlreader \
php7-xmlwriter \
ttf-dejavu && \ ttf-dejavu && \
apk add ${APK_FLAGS_PERSISTANT} --no-scripts apache2-ssl && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.2 ARG MAJOR_VERSION=3.2
@ -63,7 +67,6 @@ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSI
ADD conf/tmp/font-config /tmp/font-config ADD conf/tmp/font-config /tmp/font-config
RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
coreutils \
gettext \ gettext \
subversion && \ subversion && \
cd /usr/share/ && \ cd /usr/share/ && \
@ -90,7 +93,7 @@ VOLUME ["/etc/ssl/apache2"]
COPY ["conf/etc/zabbix/apache.conf", "/etc/zabbix/"] COPY ["conf/etc/zabbix/apache.conf", "/etc/zabbix/"]
COPY ["conf/etc/zabbix/apache_ssl.conf", "/etc/zabbix/"] COPY ["conf/etc/zabbix/apache_ssl.conf", "/etc/zabbix/"]
COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"] COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"]
COPY ["conf/etc/php5/conf.d/99-zabbix.ini", "/etc/php5/conf.d/"] COPY ["conf/etc/php7/conf.d/99-zabbix.ini", "/etc/php7/conf.d/"]
COPY ["docker-entrypoint.sh", "/usr/bin/"] COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["docker-entrypoint.sh"] ENTRYPOINT ["docker-entrypoint.sh"]

0
web-apache-mysql/alpine/conf/etc/php5/conf.d/99-zabbix.ini → web-apache-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini
View File

29
web-apache-pgsql/alpine/Dockerfile
View File

@ -33,20 +33,24 @@ RUN addgroup zabbix && \
apk update && \ apk update && \
apk add ${APK_FLAGS_PERSISTANT} \ apk add ${APK_FLAGS_PERSISTANT} \
apache2 \ apache2 \
apache2-ssl \
bash \ bash \
php5-apache2 \ php7-apache2 \
php5-bcmath \ php7-bcmath \
php5-ctype \ php7-ctype \
php5-gd \ php7-gd \
php5-gettext \ php7-gettext \
php5-json \ php7-json \
php5-ldap \ php7-ldap \
php5-pgsql \ php7-pgsql \
php5-sockets \ php7-mbstring \
php5-xmlreader \ php7-session \
php7-simplexml \
php7-sockets \
php7-xmlreader \
php7-xmlwriter \
postgresql-client \ postgresql-client \
ttf-dejavu && \ ttf-dejavu && \
apk add ${APK_FLAGS_PERSISTANT} --no-scripts apache2-ssl && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
ARG MAJOR_VERSION=3.2 ARG MAJOR_VERSION=3.2
@ -62,7 +66,6 @@ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSI
COPY ["conf/tmp/font-config", "/tmp/font-config"] COPY ["conf/tmp/font-config", "/tmp/font-config"]
RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
coreutils \
gettext \ gettext \
subversion && \ subversion && \
cd /usr/share/ && \ cd /usr/share/ && \
@ -89,7 +92,7 @@ VOLUME ["/etc/ssl/apache2"]
COPY ["conf/etc/zabbix/apache.conf", "/etc/zabbix/"] COPY ["conf/etc/zabbix/apache.conf", "/etc/zabbix/"]
COPY ["conf/etc/zabbix/apache_ssl.conf", "/etc/zabbix/"] COPY ["conf/etc/zabbix/apache_ssl.conf", "/etc/zabbix/"]
COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"] COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"]
COPY ["conf/etc/php5/conf.d/99-zabbix.ini", "/etc/php5/conf.d/"] COPY ["conf/etc/php7/conf.d/99-zabbix.ini", "/etc/php7/conf.d/"]
COPY ["docker-entrypoint.sh", "/usr/bin/"] COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["docker-entrypoint.sh"] ENTRYPOINT ["docker-entrypoint.sh"]

0
web-apache-pgsql/alpine/conf/etc/php5/conf.d/99-zabbix.ini → web-apache-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini
View File