diff --git a/cgmanifests/submodules/cgmanifest.json b/cgmanifests/submodules/cgmanifest.json index 157f60a820..bb3e1d7b86 100644 --- a/cgmanifests/submodules/cgmanifest.json +++ b/cgmanifests/submodules/cgmanifest.json @@ -255,7 +255,7 @@ "component": { "type": "git", "git": { - "commitHash": "d98bf0278d6f59a58271425963a8422ff48fe249", + "commitHash": "db78ac1d7716f56fc9f1b030b715f872f93964e4", "repositoryUrl": "https://github.com/nlohmann/json" }, "comments": "git submodule at cmake/external/json" diff --git a/cmake/external/json b/cmake/external/json index d98bf0278d..db78ac1d77 160000 --- a/cmake/external/json +++ b/cmake/external/json @@ -1 +1 @@ -Subproject commit d98bf0278d6f59a58271425963a8422ff48fe249 +Subproject commit db78ac1d7716f56fc9f1b030b715f872f93964e4 diff --git a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cpu b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cpu index 9a6e67e749..ec4a77b8df 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cpu +++ b/tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cpu @@ -1,11 +1,13 @@ FROM quay.io/pypa/manylinux2014_x86_64:latest +ENV PATH /usr/local/gradle/bin:/opt/rh/devtoolset-10/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + ADD scripts /tmp/scripts -RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh && /tmp/scripts/manylinux/install_deps.sh && rm -rf /tmp/scripts +RUN yum remove -y devtoolset\* && yum install -y devtoolset-10-binutils devtoolset-10-gcc devtoolset-10-gcc-c++ devtoolset-10-gcc-gfortran && cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh && /tmp/scripts/manylinux/install_deps.sh && rm -rf /tmp/scripts ARG BUILD_UID=1001 ARG BUILD_USER=onnxruntimedev RUN adduser --uid $BUILD_UID $BUILD_USER WORKDIR /home/$BUILD_USER USER $BUILD_USER -ENV PATH /usr/local/gradle/bin:$PATH +