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

Added logging of executed commands

Browse Source
This commit is contained in:
root
2019-05-30 21:39:41 +03:00
parent a21e6b9187 044fb85c2a
commit 74e5b2e701
37 changed files with 166 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,8 @@ LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-alpine" \
STOPSIGNAL SIGTERM
RUN addgroup zabbix && \
RUN set -eux && \
addgroup zabbix && \
adduser -S \
-D -G zabbix \
-h /var/lib/zabbix/ \
@ -63,7 +64,8 @@ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSI
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:alpine-${ZBX_VERSION}"
RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
RUN set -eux && \
apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
gettext \
git && \
cd /usr/share/ && \

6
web-apache-pgsql/centos/Dockerfile
View File

@ -8,7 +8,8 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.1
ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
RUN yum --quiet makecache && \
RUN set -eux && \
yum --quiet makecache && \
yum ${YUM_FLAGS_DEV} install \
gettext \
patch \
@ -55,7 +56,8 @@ STOPSIGNAL SIGTERM
COPY --from=builder /tmp/zabbix/ /usr/share/zabbix/
RUN groupadd --system zabbix && \
RUN set -eux && \
groupadd --system zabbix && \
adduser -r --shell /sbin/nologin \
-g zabbix \
-d /var/lib/zabbix/ \

13
web-apache-pgsql/ubuntu/Dockerfile
View File

@ -21,7 +21,8 @@ LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-ubuntu" \
STOPSIGNAL SIGTERM
RUN apt-get ${APT_FLAGS_COMMON} update && \
RUN set -eux && \
apt-get ${APT_FLAGS_COMMON} update && \
DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_PERSISTENT} install locales && \
locale-gen $LC_ALL && \
echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
@ -63,9 +64,8 @@ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSI
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:ubuntu-${ZBX_VERSION}"
COPY ["conf/tmp/font-config", "/tmp/font-config"]
RUN apt-get ${APT_FLAGS_COMMON} update && \
RUN set -eux && \
apt-get ${APT_FLAGS_COMMON} update && \
DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_DEV} install \
gettext \
patch \
@ -77,14 +77,9 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
cp -R /usr/share/zabbix-${ZBX_VERSION}/frontends/php/* /usr/share/zabbix/ && \
rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
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 && \
update-alternatives --install /usr/share/zabbix/fonts/graphfont.ttf \
zabbix-frontend-font /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf 10 && \
mkdir -p /var/lib/locales/supported.d/ && \
rm -f /var/lib/locales/supported.d/local && \
cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \