From f99f8a232f1c99a034a0f13b9cca5eaba2d588bc Mon Sep 17 00:00:00 2001 From: Jonas Bardino Date: Mon, 25 Aug 2025 17:57:43 +0200 Subject: [PATCH 1/3] Use new `make patch` from migrid PR320 to patch installed paramiko. --- Dockerfile.rocky8 | 4 ++++ Dockerfile.rocky9 | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Dockerfile.rocky8 b/Dockerfile.rocky8 index 25aae81c..3f65e2ba 100755 --- a/Dockerfile.rocky8 +++ b/Dockerfile.rocky8 @@ -1497,6 +1497,10 @@ RUN cp generated-confs/libnss_mig.conf /etc/ \ #&& cp /etc/nsswitch.conf /etc/nsswitch.conf.backup && cp generated-confs/nsswitch.conf /etc/ +# Adjust paramiko to reduce log noise from scans if matching patch is available +RUN cd $MIG_ROOT/mig/src/paramiko \ + && make patch PLATFORM=el8 + RUN chmod 755 generated-confs/envvars \ && chmod 755 generated-confs/httpd.conf diff --git a/Dockerfile.rocky9 b/Dockerfile.rocky9 index 3ea58cfc..fc2491b9 100755 --- a/Dockerfile.rocky9 +++ b/Dockerfile.rocky9 @@ -1384,6 +1384,10 @@ RUN cp generated-confs/libnss_mig.conf /etc/ \ #&& cp /etc/nsswitch.conf /etc/nsswitch.conf.backup && cp generated-confs/nsswitch.conf /etc/ +# Adjust paramiko to reduce log noise from scans if matching patch is available +RUN cd $MIG_ROOT/mig/src/paramiko \ + && make patch PLATFORM=el9 + RUN chmod 755 generated-confs/envvars \ && chmod 755 generated-confs/httpd.conf From 1cd47128194d396fa67c9453db427f8ea5d540b1 Mon Sep 17 00:00:00 2001 From: Jonas Bardino Date: Thu, 28 Aug 2025 08:33:17 +0200 Subject: [PATCH 2/3] Change `make patch` to a conditional relying on Makefile availability. --- Dockerfile.rocky8 | 2 +- Dockerfile.rocky9 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.rocky8 b/Dockerfile.rocky8 index 3f65e2ba..f38b4084 100755 --- a/Dockerfile.rocky8 +++ b/Dockerfile.rocky8 @@ -1499,7 +1499,7 @@ RUN cp generated-confs/libnss_mig.conf /etc/ \ # Adjust paramiko to reduce log noise from scans if matching patch is available RUN cd $MIG_ROOT/mig/src/paramiko \ - && make patch PLATFORM=el8 + && if [ -e Makefile ]; then make patch PLATFORM=el8 ; fi RUN chmod 755 generated-confs/envvars \ && chmod 755 generated-confs/httpd.conf diff --git a/Dockerfile.rocky9 b/Dockerfile.rocky9 index fc2491b9..93d48831 100755 --- a/Dockerfile.rocky9 +++ b/Dockerfile.rocky9 @@ -1387,6 +1387,7 @@ RUN cp generated-confs/libnss_mig.conf /etc/ \ # Adjust paramiko to reduce log noise from scans if matching patch is available RUN cd $MIG_ROOT/mig/src/paramiko \ && make patch PLATFORM=el9 + && if [ -e Makefile ]; then make patch PLATFORM=el9 ; fi RUN chmod 755 generated-confs/envvars \ && chmod 755 generated-confs/httpd.conf From 92f043e1b610c35f8c44868b6b1bc3c3ffd84b5a Mon Sep 17 00:00:00 2001 From: Jonas Bardino Date: Thu, 28 Aug 2025 10:35:39 +0200 Subject: [PATCH 3/3] Remove leftover copy of `make patch`. --- Dockerfile.rocky9 | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile.rocky9 b/Dockerfile.rocky9 index 93d48831..ef1746a0 100755 --- a/Dockerfile.rocky9 +++ b/Dockerfile.rocky9 @@ -1386,7 +1386,6 @@ RUN cp generated-confs/libnss_mig.conf /etc/ \ # Adjust paramiko to reduce log noise from scans if matching patch is available RUN cd $MIG_ROOT/mig/src/paramiko \ - && make patch PLATFORM=el9 && if [ -e Makefile ]; then make patch PLATFORM=el9 ; fi RUN chmod 755 generated-confs/envvars \