Skip to content

Commit f04c4ee

Browse files
Revert "chore: use manylinux2014_base base image for manylinux2014 (pypa#1705)"
This reverts commit e8df50c.
1 parent 45356fc commit f04c4ee

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

build.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ esac
2525

2626
# setup BASEIMAGE and its specific properties
2727
if [ "${POLICY}" == "manylinux2014" ]; then
28-
BASEIMAGE="quay.io/pypa/manylinux2014_base:2024.11.03-3"
28+
if [ "${PLATFORM}" == "s390x" ]; then
29+
BASEIMAGE="s390x/clefos:7"
30+
else
31+
BASEIMAGE="${MULTIARCH_PREFIX}centos:7"
32+
fi
2933
DEVTOOLSET_ROOTPATH="/opt/rh/devtoolset-10/root"
3034
PREPEND_PATH="${DEVTOOLSET_ROOTPATH}/usr/bin:"
3135
if [ "${PLATFORM}" == "i686" ]; then

docker/build_scripts/install-runtime-packages.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,8 @@ if [ "${AUDITWHEEL_POLICY}" == "manylinux2014" ]; then
101101
if [ "${AUDITWHEEL_ARCH}" == "x86_64" ]; then
102102
# Software collection (for devtoolset-10)
103103
yum -y install centos-release-scl-rh
104-
if ! rpm -q epel-release-7-14.noarch; then
105-
# EPEL support (for yasm)
106-
yum -y install https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm
107-
fi
104+
# EPEL support (for yasm)
105+
yum -y install https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm
108106
TOOLCHAIN_DEPS+=(yasm)
109107
elif [ "${AUDITWHEEL_ARCH}" == "aarch64" ] || [ "${AUDITWHEEL_ARCH}" == "ppc64le" ] || [ "${AUDITWHEEL_ARCH}" == "s390x" ]; then
110108
# Software collection (for devtoolset-10)

0 commit comments

Comments
 (0)