Merge pull request #198 from zabbix/master

Master
This commit is contained in:
Alexey Pustovalov
2018-02-18 23:08:00 +02:00
committed by GitHub
268 changed files with 32763 additions and 15824 deletions

View File

@ -1,5 +1,8 @@
FROM alpine:3.4
LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
ARG BUILD_DATE
ARG VCS_REF
ARG APK_FLAGS_COMMON="-q"
ARG APK_FLAGS_PERSISTANT="${APK_FLAGS_COMMON} --clean-protected --no-cache"
@ -7,6 +10,17 @@ ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache"
ARG DB_TYPE=mysql
ENV TERM=xterm
LABEL org.label-schema.name="zabbix-web-nginx-${DB_TYPE}-alpine" \
org.label-schema.vendor="Zabbix LLC" \
org.label-schema.url="https://zabbix.com/" \
org.label-schema.description="Zabbix web-interface based on Nginx web server with MySQL database support" \
org.label-schema.vcs-ref="${VCS_REF}" \
org.label-schema.build-date="${BUILD_DATE}" \
org.label-schema.schema-version="1.0" \
org.label-schema.license="GPL 2.0"
STOPSIGNAL SIGTERM
RUN addgroup zabbix && \
adduser -S \
-D -G zabbix \
@ -18,21 +32,21 @@ RUN addgroup zabbix && \
chown --quiet -R zabbix:root /etc/zabbix && \
apk update && \
apk add ${APK_FLAGS_PERSISTANT} \
supervisor \
bash \
mariadb-client-libs \
mariadb-client \
mariadb-client-libs \
nginx \
php5-fpm \
php5-mysqli \
php5-bcmath \
php5-ctype \
php5-sockets \
php5-fpm \
php5-gd \
php5-gettext \
php5-bcmath \
php5-xmlreader \
php5-ldap \
php5-json \
php5-ldap \
php5-mysqli \
php5-sockets \
php5-xmlreader \
supervisor \
ttf-dejavu && \
rm -rf /var/cache/apk/*
@ -41,7 +55,12 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.14
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} DB_TYPE=${DB_TYPE}
ADD conf/tmp/font-config /tmp/font-config
LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
org.label-schema.version="${ZBX_VERSION}" \
org.label-schema.vcs-url="${ZBX_SOURCES}" \
org.label-schema.docker.cmd="docker run --name zabbix-web-nginx-${DB_TYPE} --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-nginx-${DB_TYPE}:alpine-${ZBX_VERSION}"
COPY ["conf/tmp/font-config", "/tmp/font-config"]
RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
coreutils \
@ -59,7 +78,9 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
apk del ${APK_FLAGS_COMMON} --purge \
build-dependencies && \
rm -rf /var/cache/apk/*
rm -rf /var/cache/apk/* && \
rm -rf /root/.subversion && \
rm -rf /var/svn
EXPOSE 80/TCP 443/TCP
@ -67,15 +88,15 @@ WORKDIR /usr/share/zabbix
VOLUME ["/etc/ssl/nginx"]
ADD conf/etc/supervisor/ /etc/supervisor/
ADD conf/etc/zabbix/nginx.conf /etc/zabbix/
ADD conf/etc/zabbix/nginx_ssl.conf /etc/zabbix/
ADD conf/etc/zabbix/web/zabbix.conf.php /etc/zabbix/web/
ADD conf/etc/nginx/nginx.conf /etc/nginx/
ADD conf/etc/php5/php-fpm.conf /etc/php5/
ADD conf/etc/php5/conf.d/99-zabbix.ini /etc/php5/conf.d/
ADD run_zabbix_component.sh /
COPY ["conf/etc/supervisor/", "/etc/supervisor/"]
COPY ["conf/etc/zabbix/nginx.conf", "/etc/zabbix/"]
COPY ["conf/etc/zabbix/nginx_ssl.conf", "/etc/zabbix/"]
COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"]
COPY ["conf/etc/nginx/nginx.conf", "/etc/nginx/"]
COPY ["conf/etc/php5/php-fpm.conf", "/etc/php5/"]
COPY ["conf/etc/php5/conf.d/99-zabbix.ini", "/etc/php5/conf.d/"]
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["/bin/bash"]
ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["/run_zabbix_component.sh", "frontend", "mysql", "nginx"]
CMD ["frontend", "mysql", "nginx"]