From 1c60150a74f31088723da4fbec708d13ced9ee3b Mon Sep 17 00:00:00 2001 From: Martin Rehr Date: Mon, 4 Aug 2025 18:15:15 +0200 Subject: [PATCH 1/4] Cleanup after pylustrequota build --- Dockerfile.rocky8 | 1 + Dockerfile.rocky9 | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile.rocky8 b/Dockerfile.rocky8 index 4a925417..853ad770 100755 --- a/Dockerfile.rocky8 +++ b/Dockerfile.rocky8 @@ -1705,6 +1705,7 @@ RUN if [ "${ENABLE_QUOTA}" = "True" ] \ && make liblustreapi.la \ && cd ${MIG_ROOT}/mig/src/pylustrequota \ && python3 setup.py install; \ + && rm -rf ${MIG_ROOT}/mig/src/pylustrequota/lustre-release \ fi; \ fi; #------------------------- next stage -----------------------------# diff --git a/Dockerfile.rocky9 b/Dockerfile.rocky9 index 33641931..75fc50e4 100755 --- a/Dockerfile.rocky9 +++ b/Dockerfile.rocky9 @@ -1592,6 +1592,7 @@ RUN if [ "${ENABLE_QUOTA}" = "True" ] \ && make liblustreapi.la \ && cd ${MIG_ROOT}/mig/src/pylustrequota \ && python3 setup.py install; \ + && rm -rf ${MIG_ROOT}/mig/src/pylustrequota/lustre-release \ fi; \ fi; #------------------------- next stage -----------------------------# From 630f77aad4ab4afa90bb1f3e58edd4d8eafd4f33 Mon Sep 17 00:00:00 2001 From: Martin Rehr Date: Tue, 5 Aug 2025 13:47:59 +0200 Subject: [PATCH 2/4] Moved misplaced semi-colon --- Dockerfile.rocky8 | 4 ++-- Dockerfile.rocky9 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.rocky8 b/Dockerfile.rocky8 index 853ad770..ed81f512 100755 --- a/Dockerfile.rocky8 +++ b/Dockerfile.rocky8 @@ -1704,8 +1704,8 @@ RUN if [ "${ENABLE_QUOTA}" = "True" ] \ && cd ${MIG_ROOT}/mig/src/pylustrequota/lustre-release/lustre/utils \ && make liblustreapi.la \ && cd ${MIG_ROOT}/mig/src/pylustrequota \ - && python3 setup.py install; \ - && rm -rf ${MIG_ROOT}/mig/src/pylustrequota/lustre-release \ + && python3 setup.py install \ + && rm -rf ${MIG_ROOT}/mig/src/pylustrequota/lustre-release; \ fi; \ fi; #------------------------- next stage -----------------------------# diff --git a/Dockerfile.rocky9 b/Dockerfile.rocky9 index 75fc50e4..00a10f69 100755 --- a/Dockerfile.rocky9 +++ b/Dockerfile.rocky9 @@ -1591,8 +1591,8 @@ RUN if [ "${ENABLE_QUOTA}" = "True" ] \ && cd ${MIG_ROOT}/mig/src/pylustrequota/lustre-release/lustre/utils \ && make liblustreapi.la \ && cd ${MIG_ROOT}/mig/src/pylustrequota \ - && python3 setup.py install; \ - && rm -rf ${MIG_ROOT}/mig/src/pylustrequota/lustre-release \ + && python3 setup.py install \ + && rm -rf ${MIG_ROOT}/mig/src/pylustrequota/lustre-release; \ fi; \ fi; #------------------------- next stage -----------------------------# From 4198dcc9e3d20a779a2fae109a1808eeba3e9e77 Mon Sep 17 00:00:00 2001 From: Martin Rehr Date: Tue, 5 Aug 2025 14:16:55 +0200 Subject: [PATCH 3/4] Replaced deprecated 'python3 setup.py install' [1] https://packaging.python.org/en/latest/discussions/setup-py-deprecated/ [2] https://github.com/dependabot/dependabot-core/issues/5478 --- Dockerfile.rocky8 | 2 +- Dockerfile.rocky9 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.rocky8 b/Dockerfile.rocky8 index ed81f512..8b737064 100755 --- a/Dockerfile.rocky8 +++ b/Dockerfile.rocky8 @@ -1704,7 +1704,7 @@ RUN if [ "${ENABLE_QUOTA}" = "True" ] \ && cd ${MIG_ROOT}/mig/src/pylustrequota/lustre-release/lustre/utils \ && make liblustreapi.la \ && cd ${MIG_ROOT}/mig/src/pylustrequota \ - && python3 setup.py install \ + && python -m pip install --use-pep517 . \ && rm -rf ${MIG_ROOT}/mig/src/pylustrequota/lustre-release; \ fi; \ fi; diff --git a/Dockerfile.rocky9 b/Dockerfile.rocky9 index 00a10f69..376e2fa1 100755 --- a/Dockerfile.rocky9 +++ b/Dockerfile.rocky9 @@ -1591,7 +1591,7 @@ RUN if [ "${ENABLE_QUOTA}" = "True" ] \ && cd ${MIG_ROOT}/mig/src/pylustrequota/lustre-release/lustre/utils \ && make liblustreapi.la \ && cd ${MIG_ROOT}/mig/src/pylustrequota \ - && python3 setup.py install \ + && python -m pip install --use-pep517 . \ && rm -rf ${MIG_ROOT}/mig/src/pylustrequota/lustre-release; \ fi; \ fi; From 0430226bcde263c060ec4c91da06bd1088c89dff Mon Sep 17 00:00:00 2001 From: Martin Rehr Date: Tue, 5 Aug 2025 15:27:24 +0200 Subject: [PATCH 4/4] Keep forcing python3 for 'pylustrequota' build --- Dockerfile.rocky8 | 2 +- Dockerfile.rocky9 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.rocky8 b/Dockerfile.rocky8 index 8b737064..6ae8f6d7 100755 --- a/Dockerfile.rocky8 +++ b/Dockerfile.rocky8 @@ -1704,7 +1704,7 @@ RUN if [ "${ENABLE_QUOTA}" = "True" ] \ && cd ${MIG_ROOT}/mig/src/pylustrequota/lustre-release/lustre/utils \ && make liblustreapi.la \ && cd ${MIG_ROOT}/mig/src/pylustrequota \ - && python -m pip install --use-pep517 . \ + && python3 -m pip install --use-pep517 . \ && rm -rf ${MIG_ROOT}/mig/src/pylustrequota/lustre-release; \ fi; \ fi; diff --git a/Dockerfile.rocky9 b/Dockerfile.rocky9 index 376e2fa1..8df34b8b 100755 --- a/Dockerfile.rocky9 +++ b/Dockerfile.rocky9 @@ -1591,7 +1591,7 @@ RUN if [ "${ENABLE_QUOTA}" = "True" ] \ && cd ${MIG_ROOT}/mig/src/pylustrequota/lustre-release/lustre/utils \ && make liblustreapi.la \ && cd ${MIG_ROOT}/mig/src/pylustrequota \ - && python -m pip install --use-pep517 . \ + && python3 -m pip install --use-pep517 . \ && rm -rf ${MIG_ROOT}/mig/src/pylustrequota/lustre-release; \ fi; \ fi;