diff --git a/Dockerfile b/Dockerfile index 4aab800..00b506d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -191,8 +191,8 @@ RUN mkdir -p -m 0755 /usr/share/snmp/mibs && \ ln -s ${NAGIOS_HOME}/bin/nagios /usr/local/bin/nagios && \ download-mibs && echo "mibs +ALL" > /etc/snmp/snmp.conf -RUN sed -i 's,/bin/mail,/usr/bin/mail,' ${NAGIOS_HOME}/etc/objects/commands.cfg && \ - sed -i 's,/usr/usr,/usr,' ${NAGIOS_HOME}/etc/objects/commands.cfg +RUN sed -i 's,/bin/mail,/usr/bin/mail,' ${NAGIOS_HOME}/etc/objects/000-commands.cfg && \ + sed -i 's,/usr/usr,/usr,' ${NAGIOS_HOME}/etc/objects/000-commands.cfg RUN cp /etc/services /var/spool/postfix/etc/ && \ echo "smtp_address_preference = ipv4" >> /etc/postfix/main.cf @@ -249,6 +249,9 @@ RUN pip install speedtest-cli COPY overlay/opt/nagios/libexec/* ${NAGIOS_HOME}/libexec/ #COPY overlay/usr ${NAGIOS_HOME}/usr +RUN cd /opt/nagios/etc/objects && \ + rm -f commands.cfg contacts.cfg printer.cfg switch.cfg templates.cfg windows.cfg + #VOLUME "${NAGIOS_HOME}/var" "${NAGIOS_HOME}/etc" "/var/log/apache2" "/opt/Custom-Nagios-Plugins" "/opt/nagiosgraph/var" "/opt/nagiosgraph/etc" CMD [ "/usr/local/bin/start_nagios" ] diff --git a/docker-compose.yml b/docker-compose.yml index a1e996f..997f7e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: build: dockerfile: Dockerfile container_name: nagios - image: docker-registry1.in.thelinuxpro.net:5000/tlp/nagios:241230.0.2 + image: docker-registry1.in.thelinuxpro.net:5000/tlp/nagios:241230.0.3 networks: infra_dev_net: ipv4_address: 10.99.23.36