chore(ci/cd): improve build

Linuxfabrik · Jan 27, 2025 · 0313ed1 · 0313ed1
1 parent a818056
commit 0313ed1
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/build/debian11/Containerfile b/build/debian11/Containerfile
@@ -15,7 +15,7 @@ RUN apt-get update && \
 RUN gem install fpm
 
 RUN python3.9 -m venv --system-site-packages /opt/venv && \
-    /opt/venv/bin/python -m pip install pip==24.3.1 wheel==0.45.1 setuptools==50.3.2 && \
+    /opt/venv/bin/python -m pip install pip==25.0 wheel==0.45.1 setuptools==50.3.2 && \
     /opt/venv/bin/python -m pip install nuitka==2.6
 
 # Verify Python installation

diff --git a/build/debian12/Containerfile b/build/debian12/Containerfile
@@ -15,7 +15,7 @@ RUN apt-get update && \
 RUN gem install fpm
 
 RUN python3 -m venv --system-site-packages /opt/venv && \
-    /opt/venv/bin/python -m pip install pip==24.3.1 wheel==0.45.1 setuptools==50.3.2 && \
+    /opt/venv/bin/python -m pip install pip==25.0 wheel==0.45.1 setuptools==50.3.2 && \
     /opt/venv/bin/python -m pip install nuitka==2.6
 
 # Verify Python installation

diff --git a/build/rocky8/Containerfile b/build/rocky8/Containerfile
@@ -25,7 +25,7 @@ RUN dnf --assumeyes install --nodocs make selinux-policy-devel && \
     dnf clean all
 
 RUN python3.9 -m venv --system-site-packages /opt/venv && \
-    /opt/venv/bin/python -m pip install pip==24.3.1 wheel==0.45.1 setuptools==50.3.2 && \
+    /opt/venv/bin/python -m pip install pip==25.0 wheel==0.45.1 setuptools==50.3.2 && \
     /opt/venv/bin/python -m pip install nuitka==2.6
 
 # Verify Python installation

diff --git a/build/rocky9/Containerfile b/build/rocky9/Containerfile
@@ -25,7 +25,7 @@ RUN dnf --assumeyes install --nodocs make selinux-policy-devel && \
     dnf clean all
 
 RUN python3.12 -m venv --system-site-packages /opt/venv && \
-    /opt/venv/bin/python -m pip install pip==24.3.1 wheel==0.45.1 setuptools==75.8.0 && \
+    /opt/venv/bin/python -m pip install pip==25.0 wheel==0.45.1 setuptools==75.8.0 && \
     /opt/venv/bin/python -m pip install nuitka==2.6
 
 # Verify Python installation

diff --git a/build/shared/shared.sh b/build/shared/shared.sh
@@ -111,8 +111,8 @@ prepare_fpm() {
 EOF
 
     for file in $(cd /tmp/output/summary/check-plugins || exit 1; find . -type f | sort); do
-        # strip leading './'
-        file="'${file#./}'"
+        file=${file#./}      # Remove leading './'
+        file=${file// /\\ }  # Escape all spaces
         echo "$file=/usr/lib64/nagios/plugins/$file" >> .fpm
     done
 
@@ -145,8 +145,8 @@ EOF
 EOF
 
     for file in $(cd /tmp/output/summary/notification-plugins || exit 1; find . -type f | sort); do
-        # strip leading './'
-        file="'${file#./}'"
+        file=${file#./}      # Remove leading './'
+        file=${file// /\\ }  # Escape all spaces
         echo "$file=/usr/lib64/nagios/plugins/notifications/$file" >> .fpm
     done
 

diff --git a/build/ubuntu2004/Containerfile b/build/ubuntu2004/Containerfile
@@ -25,7 +25,7 @@ RUN gem install dotenv --version 2.8.1 --no-document && \
     gem install fpm --ignore-dependencies --no-document
 
 RUN python3.9 -m venv --system-site-packages /opt/venv && \
-    /opt/venv/bin/python -m pip install pip==24.3.1 wheel==0.45.1 setuptools==50.3.2 && \
+    /opt/venv/bin/python -m pip install pip==25.0 wheel==0.45.1 setuptools==50.3.2 && \
     /opt/venv/bin/python -m pip install nuitka==2.6
 
 # Verify Python installation

diff --git a/build/ubuntu2204/Containerfile b/build/ubuntu2204/Containerfile
@@ -15,7 +15,7 @@ RUN apt-get update && \
 RUN gem install fpm
 
 RUN python3 -m venv --system-site-packages /opt/venv && \
-    /opt/venv/bin/python -m pip install pip==24.3.1 wheel==0.45.1 setuptools==50.3.2 && \
+    /opt/venv/bin/python -m pip install pip==25.0 wheel==0.45.1 setuptools==50.3.2 && \
     /opt/venv/bin/python -m pip install nuitka==2.6
 
 # Verify Python installation

diff --git a/build/ubuntu2404/Containerfile b/build/ubuntu2404/Containerfile
@@ -15,7 +15,7 @@ RUN apt-get update && \
 RUN gem install fpm
 
 RUN python3 -m venv --system-site-packages /opt/venv && \
-    /opt/venv/bin/python -m pip install pip==24.3.1 wheel==0.45.1 setuptools==75.8.0 && \
+    /opt/venv/bin/python -m pip install pip==25.0 wheel==0.45.1 setuptools==75.8.0 && \
     /opt/venv/bin/python -m pip install nuitka==2.5.9
 
 # Verify Python installation