diff --git a/tools/dockerfile/grpc_artifact_python_manylinux_2_24_aarch64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile similarity index 69% rename from tools/dockerfile/grpc_artifact_python_manylinux_2_24_aarch64/Dockerfile rename to tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile index 0fe3b6d4338..1aee9c12f84 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux_2_24_aarch64/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile @@ -12,18 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# The aarch64 wheels are being crosscompiled to allow running the build -# on x64 machine. The dockcross/manylinux2014-aarch64 image is a x86_64 -# image with crosscompilation toolchain installed. -# We use an older version of dockcross image that has gcc4.9.4 because it was built -# before https://github.com/dockcross/dockcross/pull/449 -# Thanks to that, wheel build with this image aren't actually -# compliant with manylinux2014, but only with manylinux_2_24 FROM dockcross/manylinux2014-aarch64:20210826-19322ba -# Make the grpc wheels correctly tagged with manylinux_2_24 -# instead of the incorrect manylinux2014 (see the note above). -ENV AUDITWHEEL_PLAT manylinux_2_24_$AUDITWHEEL_ARCH +# manylinux_2_17 is the preferred alias of manylinux2014 +ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH ################################### # Install Python build requirements diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py index 6d2f7a56b51..c0543388b02 100644 --- a/tools/run_tests/artifacts/artifact_targets.py +++ b/tools/run_tests/artifacts/artifact_targets.py @@ -247,7 +247,7 @@ class CSharpExtArtifact: if self.arch == 'aarch64': # for aarch64, use a dockcross manylinux image that will # give us both ready to use crosscompiler and sufficient backward compatibility - dockerfile_dir = 'tools/dockerfile/grpc_artifact_python_manylinux_2_24_aarch64' + dockerfile_dir = 'tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64' return create_docker_jobspec( self.name, dockerfile_dir, 'tools/run_tests/artifacts/build_artifact_csharp.sh') @@ -371,11 +371,11 @@ def targets(): PythonArtifact('manylinux2010', 'x86', 'cp37-cp37m'), PythonArtifact('manylinux2010', 'x86', 'cp38-cp38'), PythonArtifact('manylinux2010', 'x86', 'cp39-cp39'), - PythonArtifact('manylinux_2_24', 'aarch64', 'cp36-cp36m'), - PythonArtifact('manylinux_2_24', 'aarch64', 'cp37-cp37m'), - PythonArtifact('manylinux_2_24', 'aarch64', 'cp38-cp38'), - PythonArtifact('manylinux_2_24', 'aarch64', 'cp39-cp39'), - PythonArtifact('manylinux_2_24', 'aarch64', 'cp310-cp310'), + PythonArtifact('manylinux2014', 'aarch64', 'cp36-cp36m'), + PythonArtifact('manylinux2014', 'aarch64', 'cp37-cp37m'), + PythonArtifact('manylinux2014', 'aarch64', 'cp38-cp38'), + PythonArtifact('manylinux2014', 'aarch64', 'cp39-cp39'), + PythonArtifact('manylinux2014', 'aarch64', 'cp310-cp310'), PythonArtifact('linux_extra', 'armv7', 'cp36-cp36m'), PythonArtifact('linux_extra', 'armv7', 'cp37-cp37m'), PythonArtifact('linux_extra', 'armv7', 'cp38-cp38'),