From 34f07e57f5800e495eefd5c488a12266e9c4ea03 Mon Sep 17 00:00:00 2001 From: trapexit Date: Mon, 9 Jun 2025 14:33:55 -0500 Subject: [PATCH] Add RHEL/CentOS 10 build support (#1479) --- buildtools/build-release | 10 ++++++++++ buildtools/containerfiles/centos.10.amd64 | 9 +++++++++ buildtools/containerfiles/centos.10.arm64 | 9 +++++++++ 3 files changed, 28 insertions(+) create mode 100644 buildtools/containerfiles/centos.10.amd64 create mode 100644 buildtools/containerfiles/centos.10.arm64 diff --git a/buildtools/build-release b/buildtools/build-release index d43ecaeb..ba131783 100755 --- a/buildtools/build-release +++ b/buildtools/build-release @@ -62,6 +62,12 @@ def parse_args(): return p.parse_args() +def should_skip(filename): + if filename.endswith('~'): + return True + return False + + def main(): args = parse_args() print(args) @@ -77,6 +83,8 @@ def main(): elif args.target == 'all': for root,dirnames,filenames in os.walk(basepath): for filename in filenames: + if should_skip(filename): + continue containerfile = f'buildtools/containerfiles/{filename}' containerfiles.append(containerfile) else: @@ -84,6 +92,8 @@ def main(): for filename in filenames: if args.target not in filename: continue + if should_skip(filename): + continue containerfile = f'buildtools/containerfiles/{filename}' containerfiles.append(containerfile) diff --git a/buildtools/containerfiles/centos.10.amd64 b/buildtools/containerfiles/centos.10.amd64 new file mode 100644 index 00000000..c51c40e2 --- /dev/null +++ b/buildtools/containerfiles/centos.10.amd64 @@ -0,0 +1,9 @@ +FROM --platform=linux/amd64 quay.io/centos/centos:10 as build +COPY install-build-pkgs build-mergerfs /tmp/ +RUN /tmp/install-build-pkgs +ARG BUILD_TIMESTAMP=0 +ARG BRANCH=master +RUN /tmp/build-mergerfs $BRANCH + +FROM scratch +COPY --from=build /build/ / diff --git a/buildtools/containerfiles/centos.10.arm64 b/buildtools/containerfiles/centos.10.arm64 new file mode 100644 index 00000000..4ab54763 --- /dev/null +++ b/buildtools/containerfiles/centos.10.arm64 @@ -0,0 +1,9 @@ +FROM --platform=linux/arm64 quay.io/centos/centos:10 as build +COPY install-build-pkgs build-mergerfs /tmp/ +RUN /tmp/install-build-pkgs +ARG BUILD_TIMESTAMP=0 +ARG BRANCH=master +RUN /tmp/build-mergerfs $BRANCH + +FROM scratch +COPY --from=build /build/ /