Skip to content

Commit

Permalink
Remove commented lines
Browse files Browse the repository at this point in the history
  • Loading branch information
tronyx committed Jun 11, 2024
1 parent 5ec8d8b commit e17b419
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 33 deletions.
12 changes: 0 additions & 12 deletions Dockerfile.linux-amd64
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,13 @@ 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 \
libnet-snmp-perl \
libnet-tftp-perl \
libnet-xmpp-perl \
libpq-dev \
#libpython2-dev \
libpython3-dev \
libredis-perl \
librrds-perl \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 && \
Expand All @@ -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
Expand Down
7 changes: 0 additions & 7 deletions Dockerfile.linux-arm-v7
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,13 @@ 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 \
libnet-snmp-perl \
libnet-tftp-perl \
libnet-xmpp-perl \
libpq-dev \
#libpython2-dev \
libpython3-dev \
libredis-perl \
librrds-perl \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 && \
Expand All @@ -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
Expand Down
14 changes: 0 additions & 14 deletions Dockerfile.linux-arm64
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,13 @@ 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 \
libnet-snmp-perl \
libnet-tftp-perl \
libnet-xmpp-perl \
libpq-dev \
#libpython2-dev \
libpython3-dev \
libredis-perl \
librrds-perl \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 && \
Expand All @@ -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
Expand Down

0 comments on commit e17b419

Please sign in to comment.