From eb737c16268629b0765cc7fa9ab189d3080f3e50 Mon Sep 17 00:00:00 2001
From: GuangJie1 <guangjiebai@gmail.com>
Date: Wed, 28 May 2025 10:15:03 +0800
Subject: [PATCH] nagios & uwsgi

---
 Others/image-list.yml                         |  2 +
 Others/nagios/4.5.9/24.03-lts-sp1/Dockerfile  | 24 ++++++
 Others/nagios/meta.yml                        |  2 +
 Others/pypi/23.3.1/24.03-lts-sp1/Dockerfile   |  9 +--
 .../pypi/23.3.1/24.03-lts-sp1/entrypoint.sh   | 73 -------------------
 Others/uwsgi/2.0.29/24.03-lts-sp1/Dockerfile  | 21 ++++++
 Others/uwsgi/meta.yml                         |  2 +
 7 files changed, 53 insertions(+), 80 deletions(-)
 create mode 100644 Others/nagios/4.5.9/24.03-lts-sp1/Dockerfile
 create mode 100644 Others/nagios/meta.yml
 delete mode 100644 Others/pypi/23.3.1/24.03-lts-sp1/entrypoint.sh
 create mode 100644 Others/uwsgi/2.0.29/24.03-lts-sp1/Dockerfile
 create mode 100644 Others/uwsgi/meta.yml

diff --git a/Others/image-list.yml b/Others/image-list.yml
index 98d9080..9259ef1 100644
--- a/Others/image-list.yml
+++ b/Others/image-list.yml
@@ -81,3 +81,5 @@ images:
   jetty: jetty
   keepalived: keepalived
   trafficserver: trafficserver
+  uwsgi: uwsgi
+  nagios: nagios
diff --git a/Others/nagios/4.5.9/24.03-lts-sp1/Dockerfile b/Others/nagios/4.5.9/24.03-lts-sp1/Dockerfile
new file mode 100644
index 0000000..6473dc9
--- /dev/null
+++ b/Others/nagios/4.5.9/24.03-lts-sp1/Dockerfile
@@ -0,0 +1,24 @@
+ARG BASE=openeuler/openeuler:24.03-lts-sp1
+FROM ${BASE}
+ARG VERSION=4.5.9
+
+RUN dnf update -y \
+    && dnf install -y gcc-c++ make glibc-common perl httpd php wget gd gd-devel openssl-devel unzip \
+    && dnf clean all \
+    && rm -rf /var/cache/dnf
+
+WORKDIR /opt
+
+RUN  wget https://github.com/NagiosEnterprises/nagioscore/archive/refs/tags/nagios-${VERSION}.tar.gz \
+    && tar -zxvf nagios-${VERSION}.tar.gz \
+    && rm -f nagios-${VERSION}.tar.gz
+
+WORKDIR /opt/nagioscore-nagios-${VERSION}
+
+RUN ./configure \
+    && make all \
+    && make install-groups-users \
+    && usermod -a -G nagios apache \
+    && make install
+
+CMD ["/usr/local/nagios/bin/nagios", "--help"]
\ No newline at end of file
diff --git a/Others/nagios/meta.yml b/Others/nagios/meta.yml
new file mode 100644
index 0000000..9deb98a
--- /dev/null
+++ b/Others/nagios/meta.yml
@@ -0,0 +1,2 @@
+4.5.9-oe2403sp1:
+  path: 4.5.9/24.03-lts-sp1/Dockerfile
diff --git a/Others/pypi/23.3.1/24.03-lts-sp1/Dockerfile b/Others/pypi/23.3.1/24.03-lts-sp1/Dockerfile
index 90c82c5..b1ddb9c 100644
--- a/Others/pypi/23.3.1/24.03-lts-sp1/Dockerfile
+++ b/Others/pypi/23.3.1/24.03-lts-sp1/Dockerfile
@@ -2,11 +2,6 @@ ARG BASE=openeuler/openeuler:24.03-lts-sp1
 FROM ${BASE}
 
 RUN yum update -y && \
-    yum install -y python3-pip python3-devel jq && \
+    yum install -y python3-pip python3-devel && \
     yum clean all && \
-    rm -rf /var/cache/yum
-
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
-ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
+    rm -rf /var/cache/yum
\ No newline at end of file
diff --git a/Others/pypi/23.3.1/24.03-lts-sp1/entrypoint.sh b/Others/pypi/23.3.1/24.03-lts-sp1/entrypoint.sh
deleted file mode 100644
index f6b2730..0000000
--- a/Others/pypi/23.3.1/24.03-lts-sp1/entrypoint.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-# Configuration with date-based paths
-EXECUTION_TIME=$(date +%s)
-PYPI_ROOT_DIR="/var/run/pypi"
-PYPI_JSON_FILE="$PYPI_ROOT_DIR/result.json"
-PYPI_CENTRAL_URL="https://pypi.org/project"
-
-if [ $# -eq 0 ]; then
-    echo "No packages specified. Nothing to do."
-    exit 0
-fi
-
-# Initialize files with execution info
-mkdir -p "$PYPI_ROOT_DIR"
-cat > "$PYPI_JSON_FILE" <<EOF
-{
-  "startTime": $EXECUTION_TIME,
-  "input": "$@",
-  "packages": []
-}
-EOF
-
-# Package installation function
-install_package() {
-    local start_time=$(date +%s)
-    local pkg=$1
-    local log="$PYPI_ROOT_DIR/${pkg}.log"
-    pip install --no-cache-dir "$pkg" >> "$log" 2>&1
-    local status=$?
-
-    local version="\"\""
-    local url="\"\""
-    if [ $status -eq 0 ]; then
-        version="$(pip show "$pkg" | grep "Version:" | awk '{print $2}')"
-        url="\"$PYPI_CENTRAL_URL/$pkg/\""
-    fi
-
-    local end_time=$(date +%s)
-    local duration=$(( end_time - start_time ))
-
-    # Build package JSON entry
-    json_packages+="$(cat <<EOF
-    {
-      "package": "$pkg",
-      "version": $version,
-      "status": "$([ $status -eq 0 ] && echo "success" || echo "failed")",
-      "duration": $duration,
-      "log": "$log",
-      "url": $url
-    },
-EOF
-)"
-}
-
-# Process all packages
-for pkg in "$@"; do
-    [[ -z "$pkg" || "$pkg" =~ ^# ]] && continue
-    install_package "$pkg"
-done
-
-# Write final JSON file
-json_packages=${json_packages%,}
-cat > "$PYPI_JSON_FILE" <<EOF
-{
-  "startTime": $EXECUTION_TIME,
-  "input": "$@",
-  "packages": [
-$json_packages
-  ],
-  "endTime": $(date +%s)
-}
-EOF
diff --git a/Others/uwsgi/2.0.29/24.03-lts-sp1/Dockerfile b/Others/uwsgi/2.0.29/24.03-lts-sp1/Dockerfile
new file mode 100644
index 0000000..4688ad3
--- /dev/null
+++ b/Others/uwsgi/2.0.29/24.03-lts-sp1/Dockerfile
@@ -0,0 +1,21 @@
+ARG BASE=openeuler/openeuler:24.03-lts-sp1
+FROM ${BASE}
+ARG VERSION=2.0.29
+
+RUN dnf update -y \
+    && dnf install -y wget python3-devel gcc make libffi-devel zlib-devel openssl-devel \
+    pcre-devel systemd-devel libuuid-devel libcap-devel libxml2-devel libyaml-devel \
+    && dnf clean all \
+    && rm -rf /var/cache/dnf
+
+WORKDIR /opt
+
+RUN wget https://github.com/unbit/uwsgi/archive/refs/tags/${VERSION}.tar.gz \
+    && tar -zxvf ${VERSION}.tar.gz \
+    && rm -f ${VERSION}.tar.gz
+
+WORKDIR /opt/uwsgi-${VERSION}
+
+RUN make -j
+
+CMD ["./uwsgi", "--help"]
\ No newline at end of file
diff --git a/Others/uwsgi/meta.yml b/Others/uwsgi/meta.yml
new file mode 100644
index 0000000..6fe6b9a
--- /dev/null
+++ b/Others/uwsgi/meta.yml
@@ -0,0 +1,2 @@
+2.0.29-oe2403sp1:
+  path: 2.0.29/24.03-lts-sp1/Dockerfile
-- 
Gitee