extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-04-03 12:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated CentOS images

Browse Source
This commit is contained in:
Alexey Pustovalov 2020-04-27 18:27:35 +03:00
parent f75da019c1
commit aae41ac7b7
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java-gateway/alpine/Dockerfile
View File

@ -33,6 +33,8 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati
org.opencontainers.image.version="${ZBX_VERSION}" \ org.opencontainers.image.version="${ZBX_VERSION}" \
org.opencontainers.image.source="${ZBX_SOURCES}" org.opencontainers.image.source="${ZBX_SOURCES}"
COPY ["conf/etc/", "/etc/"]
RUN set -eux && \ RUN set -eux && \
apk add --no-cache --virtual build-dependencies \ apk add --no-cache --virtual build-dependencies \
autoconf \ autoconf \
@ -64,9 +66,9 @@ RUN set -eux && \
rm -rf /usr/sbin/zabbix_java/lib/*.xml && \ rm -rf /usr/sbin/zabbix_java/lib/*.xml && \
cd /tmp/ && \ cd /tmp/ && \
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
chown --quiet -R zabbix:root /etc/zabbix/ && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/sbin/zabbix_java/ && \
chgrp -R 0 /etc/zabbix/ && \ chgrp -R 0 /etc/zabbix/ /usr/sbin/zabbix_java/ && \
chmod -R g=u /etc/zabbix/ && \ chmod -R g=u /etc/zabbix/ /usr/sbin/zabbix_java/ && \
apk del --purge --no-network \ apk del --purge --no-network \
build-dependencies && \ build-dependencies && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
@ -75,7 +77,6 @@ EXPOSE 10052/TCP
WORKDIR /var/lib/zabbix WORKDIR /var/lib/zabbix
COPY ["conf/etc/zabbix/zabbix_java_gateway_logback.xml", "/etc/zabbix/"]
COPY ["conf/usr/sbin/zabbix_java_gateway", "/usr/sbin/"] COPY ["conf/usr/sbin/zabbix_java_gateway", "/usr/sbin/"]
COPY ["docker-entrypoint.sh", "/usr/bin/"] COPY ["docker-entrypoint.sh", "/usr/bin/"]

9
java-gateway/centos/Dockerfile
View File

@ -34,6 +34,8 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati
org.opencontainers.image.version="${ZBX_VERSION}" \ org.opencontainers.image.version="${ZBX_VERSION}" \
org.opencontainers.image.source="${ZBX_SOURCES}" org.opencontainers.image.source="${ZBX_SOURCES}"
COPY ["conf/etc/", "/etc/"]
RUN set -eux && \ RUN set -eux && \
yum --quiet makecache && \ yum --quiet makecache && \
yum -y install --setopt=tsflags=nodocs \ yum -y install --setopt=tsflags=nodocs \
@ -66,9 +68,9 @@ RUN set -eux && \
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \ yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
yum -y clean all && \ yum -y clean all && \
chown --quiet -R zabbix:root /etc/zabbix/ && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/sbin/zabbix_java/ && \
chgrp -R 0 /etc/zabbix/ && \ chgrp -R 0 /etc/zabbix/ /usr/sbin/zabbix_java/ && \
chmod -R g=u /etc/zabbix/ && \ chmod -R g=u /etc/zabbix/ /usr/sbin/zabbix_java/ && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
rm -rf /etc/udev/hwdb.bin /root/.pki rm -rf /etc/udev/hwdb.bin /root/.pki
@ -76,7 +78,6 @@ EXPOSE 10052/TCP
WORKDIR /var/lib/zabbix WORKDIR /var/lib/zabbix
COPY ["conf/etc/zabbix/zabbix_java_gateway_logback.xml", "/etc/zabbix/"]
COPY ["conf/usr/sbin/zabbix_java_gateway", "/usr/sbin/"] COPY ["conf/usr/sbin/zabbix_java_gateway", "/usr/sbin/"]
COPY ["docker-entrypoint.sh", "/usr/bin/"] COPY ["docker-entrypoint.sh", "/usr/bin/"]