extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-01-05 21:29:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
root 2018-05-29 20:49:57 -07:00
commit ba274f7451
2 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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