diff --git a/py/CHANGELOG.md b/py/CHANGELOG.md index c4b56541000..ef7e756e97a 100644 --- a/py/CHANGELOG.md +++ b/py/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Unreleased + +- Build wheels with manylinux_2_28 and alma linux 8. [#3787](https://github.com/getsentry/relay/pull/3787) + ## 0.8.67 ### Various fixes & improvements diff --git a/py/Dockerfile b/py/Dockerfile index 27a11d18a37..e1174790425 100644 --- a/py/Dockerfile +++ b/py/Dockerfile @@ -1,4 +1,4 @@ -FROM amd64/centos:7 +FROM almalinux:8 # This must be lower case - used in the paths and packages names ARG TARGET @@ -9,11 +9,7 @@ RUN yum -y update \ perl-core openssl openssl-devel pkgconfig libatomic \ && if [ "$(uname -m)" != ${TARGET} ]; then \ yum install -y "binutils-${TARGET}-linux-gnu" "gcc-${TARGET}-linux-gnu" "gcc-c++-${TARGET}-linux-gnu" \ - && if [ ${TARGET} == "aarch64" ]; then \ - curl -L -s https://www.centos.org/keys/RPM-GPG-KEY-CentOS-7-aarch64 > /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-aarch64 \ - && cat /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-aarch64 >> /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 ; \ - fi \ - && dnf --forcearch "${TARGET}" --release 7 install -y gcc glibc glibc-devel --installroot "/usr/${TARGET}-linux-gnu/sys-root/" || true \ + && dnf --forcearch "${TARGET}" --releasever=8 install -y gcc glibc glibc-devel --installroot "/usr/${TARGET}-linux-gnu/sys-root/" || true \ && ln -s "/usr/${TARGET}-linux-gnu/sys-root/usr/lib64/libgcc_s.so.1" "/usr/${TARGET}-linux-gnu/sys-root/usr/lib64/libgcc_s.so"; \ fi \ && yum clean all \ diff --git a/scripts/docker-manylinux.sh b/scripts/docker-manylinux.sh index dfe3247d1d7..a9b93802efa 100755 --- a/scripts/docker-manylinux.sh +++ b/scripts/docker-manylinux.sh @@ -34,7 +34,7 @@ docker run \ -v "$(pwd):/work" \ -e SKIP_RELAY_LIB_BUILD=1 \ -e CARGO_BUILD_TARGET \ - quay.io/pypa/manylinux2014_${TARGET} \ + quay.io/pypa/manylinux_2_28_${TARGET} \ sh manylinux.sh # Fix permissions for shared directories