diff --git a/Others/image-list.yml b/Others/image-list.yml index 98d908085024d84609bda3eca9803c315d59cc82..9259ef1c8ff85e21ab479e8f9358942415b75a0c 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 0000000000000000000000000000000000000000..6473dc9dd8c1e93ac16e5f0f3c1b080c9e733c3b --- /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 0000000000000000000000000000000000000000..9deb98ac05271b37052bb3c2617897e1cdfe1d5f --- /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 90c82c5cb7d1f94ef62fc60408769c2cd33922b8..b1ddb9ce319b20c6998b77602bd321320d09e779 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 f6b2730c8c3a05e654da8ec6c6d084dc3232b448..0000000000000000000000000000000000000000 --- 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" <> "$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 < "$PYPI_JSON_FILE" <