Merge pull request #34 from tronyx/develop

Develop
tronyx · Sep 8, 2023 · 123e4be · 123e4be
2 parents 428d443 + 5cdaa8c
commit 123e4be
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/Dockerfile.linux-amd64 b/Dockerfile.linux-amd64
@@ -5,8 +5,8 @@ ARG BUILDKIT_SBOM_SCAN_STAGE=true
 FROM ubuntu:22.04
 
 LABEL name="Nagios" \
-    nagiosVersion="4.4.13" \
-    nagiosPluginsVersion="2.4.5" \
+    nagiosVersion="4.4.14" \
+    nagiosPluginsVersion="2.4.6" \
     nrpeVersion="4.1.0" \
     nscaVersion="2.10.2" \
     ncpaVersion="2.4.1" \
@@ -29,8 +29,8 @@ ENV NAGIOS_HOME=/opt/nagios \
     APACHE_LOG_DIR=/var/log/apache2 \
     NAGIOS_TIMEZONE=UTC \
     DEBIAN_FRONTEND=noninteractive \
-    NAGIOS_BRANCH=nagios-4.4.13 \
-    NAGIOS_PLUGINS_BRANCH=release-2.4.5 \
+    NAGIOS_BRANCH=nagios-4.4.14 \
+    NAGIOS_PLUGINS_BRANCH=release-2.4.6 \
     NRPE_BRANCH=nrpe-4.1.0 \
     NSCA_TAG=nsca-2.10.2 \
     NCPA_BRANCH=v2.4.1 \

diff --git a/Dockerfile.linux-arm-v7 b/Dockerfile.linux-arm-v7
@@ -5,8 +5,8 @@ ARG BUILDKIT_SBOM_SCAN_STAGE=true
 FROM ubuntu:22.04
 
 LABEL name="Nagios" \
-    nagiosVersion="4.4.13" \
-    nagiosPluginsVersion="2.4.5" \
+    nagiosVersion="4.4.14" \
+    nagiosPluginsVersion="2.4.6" \
     nrpeVersion="4.1.0" \
     nscaVersion="2.10.2" \
     ncpaVersion="2.4.1" \
@@ -29,8 +29,8 @@ ENV NAGIOS_HOME=/opt/nagios \
     APACHE_LOG_DIR=/var/log/apache2 \
     NAGIOS_TIMEZONE=UTC \
     DEBIAN_FRONTEND=noninteractive \
-    NAGIOS_BRANCH=nagios-4.4.13 \
-    NAGIOS_PLUGINS_BRANCH=release-2.4.5 \
+    NAGIOS_BRANCH=nagios-4.4.14 \
+    NAGIOS_PLUGINS_BRANCH=release-2.4.6 \
     NRPE_BRANCH=nrpe-4.1.0 \
     NSCA_TAG=nsca-2.10.2 \
     NCPA_BRANCH=v2.4.1 \
@@ -232,6 +232,8 @@ RUN cd /opt && \
     export PATH="/root/.cargo/bin:$PATH" && \
     wget -q -O get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
     python2 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 pip install --upgrade pip && \
     pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt bcrypt && \

diff --git a/Dockerfile.linux-arm64 b/Dockerfile.linux-arm64
@@ -5,8 +5,8 @@ ARG BUILDKIT_SBOM_SCAN_STAGE=true
 FROM ubuntu:22.04
 
 LABEL name="Nagios" \
-    nagiosVersion="4.4.13" \
-    nagiosPluginsVersion="2.4.5" \
+    nagiosVersion="4.4.14" \
+    nagiosPluginsVersion="2.4.6" \
     nrpeVersion="4.1.0" \
     nscaVersion="2.10.2" \
     ncpaVersion="2.4.1" \
@@ -29,8 +29,8 @@ ENV NAGIOS_HOME=/opt/nagios \
     APACHE_LOG_DIR=/var/log/apache2 \
     NAGIOS_TIMEZONE=UTC \
     DEBIAN_FRONTEND=noninteractive \
-    NAGIOS_BRANCH=nagios-4.4.13 \
-    NAGIOS_PLUGINS_BRANCH=release-2.4.5 \
+    NAGIOS_BRANCH=nagios-4.4.14 \
+    NAGIOS_PLUGINS_BRANCH=release-2.4.6 \
     NRPE_BRANCH=nrpe-4.1.0 \
     NSCA_TAG=nsca-2.10.2 \
     NCPA_BRANCH=v2.4.1 \
@@ -225,6 +225,8 @@ RUN cd /tmp && \
 RUN cd /opt && \
     wget -q -O get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
     python2 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" && \
     pip3 install --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/ --upgrade requests && \

diff --git a/README.md b/README.md
@@ -36,8 +36,8 @@ Nagios Core running on Ubuntu 22.04 LTS with NagiosGraph, NRPE, NCPA, NSCA, Chec
 
 | Product | Version |
 | ------- | ------- |
-| [Nagios Core](https://www.nagios.org/projects/nagios-core/history/4x/) | 4.4.13 |
-| [Nagios Plugins](https://github.com/nagios-plugins/nagios-plugins) | 2.4.5 |
+| [Nagios Core](https://github.com/NagiosEnterprises/nagioscore/releases) | 4.4.14 |
+| [Nagios Plugins](https://github.com/nagios-plugins/nagios-plugins) | 2.4.6 |
 | [NRPE](https://github.com/NagiosEnterprises/nrpe) | 4.1.0 |
 | [NCPA](https://github.com/NagiosEnterprises/ncpa) | 2.4.1 |
 | [NSCA](https://github.com/NagiosEnterprises/nsca) | 2.10.2 |