Skip to content

Commit

Permalink
build(lib): Update manylinux container to 2_28 (#3787)
Browse files Browse the repository at this point in the history
- Updates to manylinux_2_28
- Updates the build container to almalinux 8, same which is used for the
manylinux_2_28 container

Fixes: #3785
  • Loading branch information
Dav1dde authored and 0Calories committed Jul 10, 2024
1 parent 3812163 commit 4823ec7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 4 additions & 0 deletions py/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 2 additions & 6 deletions py/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker-manylinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4823ec7

Please sign in to comment.