extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-09 16:45:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

CentOS images fix. Systemd issue

Browse Source
This commit is contained in:
root
2018-05-28 13:06:11 -07:00
parent f2815b4f59 5fae1b3437
commit b913a1c872
13 changed files with 789 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
web-nginx-pgsql/centos/Dockerfile
View File

@ -1,3 +1,32 @@
FROM centos:centos7 as builder
ARG YUM_FLAGS_COMMON="--quiet -y"
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
TERM=xterm \
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx
COPY ["conf/tmp/font-config", "/tmp/font-config"]
RUN yum --quiet makecache && \
yum ${YUM_FLAGS_DEV} install \
gettext \
patch \
subversion && \
cd /tmp/ && \
svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \
cd /tmp/zabbix/ && \
patch -p3 < /tmp/font-config && \
rm /tmp/font-config && \
rm -f conf/zabbix.conf.php && \
rm -rf tests && \
rm /tmp/zabbix/fonts/DejaVuSans.ttf && \
./locale/make_mo.sh 2>/dev/null
FROM centos:centos7
LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
@ -6,8 +35,11 @@ ARG VCS_REF
ARG YUM_FLAGS_COMMON="--quiet -y"
ARG YUM_FLAGS_PERSISTANT="${YUM_FLAGS_COMMON}"
ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
ENV TERM=xterm \
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
TERM=xterm \
ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx
LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-centos" \
@ -17,10 +49,16 @@ LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-centos" \
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"
org.label-schema.license="GPL v2.0" \
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-${ZBX_OPT_TYPE}-pgsql --link postgres-server:postgres --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-${ZBX_OPT_TYPE}-pgsql:centos-${ZBX_VERSION}"
STOPSIGNAL SIGTERM
COPY --from=builder /tmp/zabbix/ /usr/share/zabbix/
RUN groupadd --system zabbix && \
adduser -r --shell /sbin/nologin \
-g zabbix \
@ -30,7 +68,7 @@ RUN groupadd --system zabbix && \
mkdir -p /etc/zabbix/web && \
chown --quiet -R zabbix:root /etc/zabbix && \
yum ${YUM_FLAGS_COMMON} makecache && \
yum ${YUM_FLAGS_DEV} install epel-release && \
yum ${YUM_FLAGS_PERSISTANT} install epel-release && \
yum ${YUM_FLAGS_PERSISTANT} install supervisor \
dejavu-sans-fonts \
nginx \
@ -42,49 +80,13 @@ RUN groupadd --system zabbix && \
php-mbstring \
php-pgsql \
php-xml && \
ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
rm -f /etc/php-fpm.d/www.conf && \
mkdir -p /var/lib/php/ && \
chown --quiet -R nginx:nginx /var/lib/php/ && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \
rm -rf /var/cache/yum/
ARG MAJOR_VERSION=3.2
ARG ZBX_VERSION=${MAJOR_VERSION}.11
ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
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-${ZBX_OPT_TYPE}-pgsql --link postgres-server:postgres --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-${ZBX_OPT_TYPE}-pgsql:centos-${ZBX_VERSION}"
COPY ["conf/tmp/font-config", "/tmp/font-config"]
RUN yum --quiet makecache && \
yum ${YUM_FLAGS_DEV} install \
gettext \
patch \
subversion && \
cd /usr/share/ && \
svn --quiet export ${ZBX_SOURCES}/frontends/php/ zabbix 1>/dev/null && \
cd /usr/share/zabbix/ && \
patch -p3 < /tmp/font-config && \
rm /tmp/font-config && \
rm -f conf/zabbix.conf.php && \
rm -rf tests && \
rm /usr/share/zabbix/fonts/DejaVuSans.ttf && \
./locale/make_mo.sh 2>/dev/null && \
chown -R nginx:nginx /usr/share/zabbix && \
ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
yum ${YUM_FLAGS_COMMON} history undo `yum history | sed -n 4p |column -t | cut -d' ' -f1` 1>/dev/null && \
yum ${YUM_FLAGS_COMMON} clean all && \
rm -rf /etc/udev/hwdb.bin && \
rm -rf /var/cache/yum && \
rm -rf /var/lib/yum/yumdb/* && \
rm -rf /usr/lib/udev/hwdb.d/* && \
rm -rf /root/.pki && \
rm -rf /root/.subversion
EXPOSE 80/TCP 443/TCP
WORKDIR /usr/share/zabbix