Added logging of executed commands

This commit is contained in:
root
2019-05-30 21:38:58 +03:00
37 changed files with 166 additions and 107 deletions

View File

@ -21,7 +21,8 @@ LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-alpine" \
STOPSIGNAL SIGTERM
RUN addgroup zabbix && \
RUN set -eux && \
addgroup zabbix && \
adduser -S \
-D -G zabbix \
-h /var/lib/zabbix/ \
@ -69,7 +70,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-${ZBX_TYPE}-${ZBX_DB_TYPE} --link mysql-server:mysql --link zabbix-server:zabbix-server -p 10051:10051 -d zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}:alpine-${ZBX_VERSION}"
RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
RUN set -eux && \
apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
autoconf \
automake \
coreutils \
@ -124,8 +126,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
apk del ${APK_FLAGS_COMMON} --purge \
build-dependencies && \
rm -rf /var/cache/apk/* && \
rm -rf /root/.subversion
rm -rf /var/cache/apk/*
EXPOSE 10051/TCP

View File

@ -9,7 +9,8 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
ZBX_TYPE=proxy ZBX_DB_TYPE=mysql
RUN yum --quiet makecache && \
RUN set -eux && \
yum --quiet makecache && \
yum ${YUM_FLAGS_DEV} install \
autoconf \
automake \
@ -94,7 +95,8 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
RUN groupadd --system zabbix && \
RUN set -eux && \
groupadd --system zabbix && \
adduser -r --shell /sbin/nologin \
-g zabbix \
-d /var/lib/zabbix/ \
@ -114,7 +116,7 @@ RUN groupadd --system zabbix && \
chown --quiet -R zabbix:root /var/lib/zabbix && \
mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
yum ${YUM_FLAGS_COMMON} makecache && \
yum ${YUM_FLAGS_PERSISTENT} install http://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
yum ${YUM_FLAGS_PERSISTENT} install https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
yum ${YUM_FLAGS_PERSISTENT} install \
libcurl \
libevent \
@ -126,7 +128,7 @@ RUN groupadd --system zabbix && \
openssl-libs \
pcre \
unixODBC && \
yum ${YUM_FLAGS_PERSISTANT} clean all && \
yum ${YUM_FLAGS_PERSISTENT} clean all && \
rm -rf /var/cache/yum/ && \
chmod +x /sbin/tini

View File

@ -24,7 +24,8 @@ LABEL org.label-schema.name="zabbix-${ZBX_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 && \
@ -80,7 +81,8 @@ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSI
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
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 \
autoconf \
automake \