From e17b41924b6cf8250e345a39bad9f8321e00d8f5 Mon Sep 17 00:00:00 2001 From: Chris Yocum Date: Tue, 11 Jun 2024 13:51:20 -0400 Subject: [PATCH] Remove commented lines --- Dockerfile.linux-amd64 | 12 ------------ Dockerfile.linux-arm-v7 | 7 ------- Dockerfile.linux-arm64 | 14 -------------- 3 files changed, 33 deletions(-) diff --git a/Dockerfile.linux-amd64 b/Dockerfile.linux-amd64 index a6ffc6c..94d2677 100644 --- a/Dockerfile.linux-amd64 +++ b/Dockerfile.linux-amd64 @@ -82,7 +82,6 @@ RUN echo postfix postfix/main_mailer_type string "'Internet Site'" | debconf-set libgd-gd2-perl \ libjson-perl \ libldap2-dev \ - #libmysqlclient-dev \ libmariadb-dev \ libnagios-object-perl \ libmonitoring-plugin-perl \ @@ -90,7 +89,6 @@ RUN echo postfix postfix/main_mailer_type string "'Internet Site'" | debconf-set libnet-tftp-perl \ libnet-xmpp-perl \ libpq-dev \ - #libpython2-dev \ libpython3-dev \ libredis-perl \ librrds-perl \ @@ -105,7 +103,6 @@ RUN echo postfix postfix/main_mailer_type string "'Internet Site'" | debconf-set php-cli \ php-gd \ postfix \ - #python2 \ python3-full \ python3-nagiosplugin \ python3-pip \ @@ -224,18 +221,10 @@ RUN cd /tmp && \ # Install additional plugins RUN cd /opt && \ - #wget -q -O get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \ - #wget -q https://bootstrap.pypa.io/get-pip.py && \ - #python2 get-pip.py && \ - #python3 get-pip.py && \ - #pip install --no-cache-dir "pymssql<2.2.0" && \ python3 -m venv .venv && \ . .venv/bin/activate && \ - #pip3 install --break-system-packages --no-cache-dir pymssql && \ pip3 install --no-cache-dir pymssql && \ - #pip3 install --break-system-packages --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt && \ pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt && \ - #pip3 install --break-system-packages --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ --upgrade requests && \ pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ --upgrade requests && \ git clone https://github.com/willixix/naglio-plugins.git WL-Nagios-Plugins && \ git clone https://github.com/JasonRivers/nagios-plugins.git JR-Nagios-Plugins && \ @@ -255,7 +244,6 @@ RUN cd /opt && \ cp /opt/DF-Nagios-Plugins/check_sql/check_sql ${NAGIOS_HOME}/libexec/ && \ cp /opt/DF-Nagios-Plugins/check_jenkins/check_jenkins ${NAGIOS_HOME}/libexec/ && \ cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/ && \ - ######cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/ cp /opt/jpmens-mqtt/check-mqtt.py ${NAGIOS_HOME}/libexec/ # Add check_apc.pl check diff --git a/Dockerfile.linux-arm-v7 b/Dockerfile.linux-arm-v7 index 8ab847e..4f4f115 100644 --- a/Dockerfile.linux-arm-v7 +++ b/Dockerfile.linux-arm-v7 @@ -88,7 +88,6 @@ RUN echo postfix postfix/main_mailer_type string "'Internet Site'" | debconf-set libjson-perl \ libkrb5-dev \ libldap2-dev \ - #libmysqlclient-dev \ libmariadb-dev \ libnagios-object-perl \ libmonitoring-plugin-perl \ @@ -96,7 +95,6 @@ RUN echo postfix postfix/main_mailer_type string "'Internet Site'" | debconf-set libnet-tftp-perl \ libnet-xmpp-perl \ libpq-dev \ - #libpython2-dev \ libpython3-dev \ libredis-perl \ librrds-perl \ @@ -111,7 +109,6 @@ RUN echo postfix postfix/main_mailer_type string "'Internet Site'" | debconf-set php-cli \ php-gd \ postfix \ - #python2 \ python3-full \ python3-nagiosplugin \ python3-pip \ @@ -248,11 +245,8 @@ RUN cd /opt && \ #pip install --no-cache-dir "pymssql<2.2.0" && \ python3 -m venv .venv && \ . .venv/bin/activate && \ - #pip3 install --break-system-packages --no-cache-dir pymssql && \ pip3 install --no-cache-dir pymssql && \ - #pip3 install --break-system-packages --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt && \ pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt && \ - #pip3 install --break-system-packages --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ --upgrade requests && \ pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ --upgrade requests && \ git clone https://github.com/willixix/naglio-plugins.git WL-Nagios-Plugins && \ git clone https://github.com/JasonRivers/nagios-plugins.git JR-Nagios-Plugins && \ @@ -272,7 +266,6 @@ RUN cd /opt && \ cp /opt/DF-Nagios-Plugins/check_sql/check_sql ${NAGIOS_HOME}/libexec/ && \ cp /opt/DF-Nagios-Plugins/check_jenkins/check_jenkins ${NAGIOS_HOME}/libexec/ && \ cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/ && \ - #######cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/ cp /opt/jpmens-mqtt/check-mqtt.py ${NAGIOS_HOME}/libexec/ # Add check_apc.pl check diff --git a/Dockerfile.linux-arm64 b/Dockerfile.linux-arm64 index 6584ee1..2ef73e4 100644 --- a/Dockerfile.linux-arm64 +++ b/Dockerfile.linux-arm64 @@ -82,7 +82,6 @@ RUN echo postfix postfix/main_mailer_type string "'Internet Site'" | debconf-set libgd-gd2-perl \ libjson-perl \ libldap2-dev \ - #libmysqlclient-dev \ libmariadb-dev \ libnagios-object-perl \ libmonitoring-plugin-perl \ @@ -90,7 +89,6 @@ RUN echo postfix postfix/main_mailer_type string "'Internet Site'" | debconf-set libnet-tftp-perl \ libnet-xmpp-perl \ libpq-dev \ - #libpython2-dev \ libpython3-dev \ libredis-perl \ librrds-perl \ @@ -105,7 +103,6 @@ RUN echo postfix postfix/main_mailer_type string "'Internet Site'" | debconf-set php-cli \ php-gd \ postfix \ - #python2 \ python3-full \ python3-nagiosplugin \ python3-pip \ @@ -228,20 +225,10 @@ RUN cd /tmp && \ # Install additional plugins RUN cd /opt && \ - #wget -q -O get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \ - #wget -q https://bootstrap.pypa.io/get-pip.py && \ - #python2 get-pip.py && \ - #python3 get-pip.py && \ - #echo "Cython==0.29.35" >> constraints.txt && \ - #export PIP_CONSTRAINT="$(pwd)/constraints.txt" && \ - #pip install --no-cache-dir "pymssql<2.2.0" && \ python3 -m venv .venv && \ . .venv/bin/activate && \ - #pip3 install --break-system-packages --no-cache-dir pymssql && \ pip3 install --no-cache-dir pymssql && \ - #pip3 install --break-system-packages --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt && \ pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt && \ - #pip3 install --break-system-packages --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ --upgrade requests && \ pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ --upgrade requests && \ git clone https://github.com/willixix/naglio-plugins.git WL-Nagios-Plugins && \ git clone https://github.com/JasonRivers/nagios-plugins.git JR-Nagios-Plugins && \ @@ -261,7 +248,6 @@ RUN cd /opt && \ cp /opt/DF-Nagios-Plugins/check_sql/check_sql ${NAGIOS_HOME}/libexec/ && \ cp /opt/DF-Nagios-Plugins/check_jenkins/check_jenkins ${NAGIOS_HOME}/libexec/ && \ cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/ && \ - ######cp /opt/DF-Nagios-Plugins/check_vpn/check_vpn ${NAGIOS_HOME}/libexec/ cp /opt/jpmens-mqtt/check-mqtt.py ${NAGIOS_HOME}/libexec/ # Add check_apc.pl check