diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index fdbec28b5..c3b691b0f 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -33,6 +33,8 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati org.opencontainers.image.version="${ZBX_VERSION}" \ org.opencontainers.image.source="${ZBX_SOURCES}" +COPY ["conf/etc/", "/etc/"] + RUN set -eux && \ apk add --no-cache --virtual build-dependencies \ autoconf \ @@ -64,9 +66,9 @@ RUN set -eux && \ rm -rf /usr/sbin/zabbix_java/lib/*.xml && \ cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ - chown --quiet -R zabbix:root /etc/zabbix/ && \ - chgrp -R 0 /etc/zabbix/ && \ - chmod -R g=u /etc/zabbix/ && \ + chown --quiet -R zabbix:root /etc/zabbix/ /usr/sbin/zabbix_java/ && \ + chgrp -R 0 /etc/zabbix/ /usr/sbin/zabbix_java/ && \ + chmod -R g=u /etc/zabbix/ /usr/sbin/zabbix_java/ && \ apk del --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* @@ -75,7 +77,6 @@ EXPOSE 10052/TCP 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 ["docker-entrypoint.sh", "/usr/bin/"] diff --git a/java-gateway/centos/Dockerfile b/java-gateway/centos/Dockerfile index cb0488e7d..191789e7f 100644 --- a/java-gateway/centos/Dockerfile +++ b/java-gateway/centos/Dockerfile @@ -34,6 +34,8 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati org.opencontainers.image.version="${ZBX_VERSION}" \ org.opencontainers.image.source="${ZBX_SOURCES}" +COPY ["conf/etc/", "/etc/"] + RUN set -eux && \ yum --quiet makecache && \ yum -y install --setopt=tsflags=nodocs \ @@ -66,9 +68,9 @@ RUN set -eux && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \ yum -y clean all && \ - chown --quiet -R zabbix:root /etc/zabbix/ && \ - chgrp -R 0 /etc/zabbix/ && \ - chmod -R g=u /etc/zabbix/ && \ + chown --quiet -R zabbix:root /etc/zabbix/ /usr/sbin/zabbix_java/ && \ + chgrp -R 0 /etc/zabbix/ /usr/sbin/zabbix_java/ && \ + 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 /etc/udev/hwdb.bin /root/.pki @@ -76,7 +78,6 @@ EXPOSE 10052/TCP 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 ["docker-entrypoint.sh", "/usr/bin/"]