[CI][conda] - Update conda build docker to centos8 (#2427)

* upgrade docker to centos 8 * try collapsing bash call to one line
facebookresearch · Jul 12, 2024 · 9ece203 · 9ece203
1 parent 60a751c
commit 9ece203
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -708,13 +708,7 @@ jobs:
               docker run -it --ipc=host --rm -v $(pwd)/../../:/remote \
                   <<^ parameters.CI_TEST >> --env << parameters.AIHABITAT_CONDA_CHN_PWD_VAR >> <</ parameters.CI_TEST >> \
                   hsim_condabuild_dcontainer \
-                  /bin/bash -c "source ~/.bashrc && conda activate py39 \
-                                && cd /remote/habitat-sim/ && git config --global --add safe.directory '*' \
-                                && cd /remote/habitat-sim/conda-build \
-                                <<^ parameters.CI_TEST >> && yes | anaconda login --username << parameters.AIHABITAT_CONDA_CHN >> --password \${<< parameters.AIHABITAT_CONDA_CHN_PWD_VAR >>} <</ parameters.CI_TEST >> --hostname "aihabitat-conda-ci-builder-linux" \
-                                && python matrix_builder.py \
-                                  <<# parameters.CI_TEST >> --ci_test <</ parameters.CI_TEST>> \
-                                  <<^ parameters.CI_TEST >> --conda_upload << parameters.NIGHTLY_FLAG >> <</ parameters.CI_TEST >>"
+                  /bin/bash -c "source ~/.bashrc && conda activate py39 && cd /remote/habitat-sim/ && git config --global --add safe.directory '*' && cd /remote/habitat-sim/conda-build <<^ parameters.CI_TEST >> && yes | anaconda login --username << parameters.AIHABITAT_CONDA_CHN >> --password \${<< parameters.AIHABITAT_CONDA_CHN_PWD_VAR >>} --hostname "aihabitat-conda-ci-builder-linux" <</ parameters.CI_TEST >> && python matrix_builder.py <<# parameters.CI_TEST >> --ci_test <</ parameters.CI_TEST>> <<^ parameters.CI_TEST >> --conda_upload << parameters.NIGHTLY_FLAG >> <</ parameters.CI_TEST >>"
 
   update_docs:
     docker:

diff --git a/conda-build/Dockerfile b/conda-build/Dockerfile
@@ -1,19 +1,19 @@
-FROM nvidia/cudagl:10.0-devel-centos7
+FROM nvidia/cudagl:10.1-devel-centos8
 
 ENV LC_ALL en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US.UTF-8
 ARG AIHABITAT_CONDA_CHN
 ARG AIHABITAT_CONDA_CHN_PWD
 
-RUN yum install -y wget curl perl cmake util-linux xz bzip2 git patch which unzip python3
-RUN yum install -y yum-utils centos-release-scl
-RUN yum-config-manager --enable rhel-server-rhscl-7-rpms
-RUN yum install -y devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-gcc-gfortran devtoolset-7-binutils
-ENV PATH=/opt/rh/devtoolset-7/root/usr/bin:$PATH
-ENV LD_LIBRARY_PATH=/opt/rh/devtoolset-7/root/usr/lib64:/opt/rh/devtoolset-7/root/usr/lib:$LD_LIBRARY_PATH
+RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
+RUN sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
+RUN sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+RUN yum -y --nogpgcheck update --nobest
 
-RUN yum install -y autoconf aclocal automake make
+RUN yum install -y yum-utils
+RUN yum install -y wget curl perl cmake util-linux xz bzip2 git patch which unzip python3
+RUN yum install -y autoconf automake make
 RUN yum install -y mesa-libEGL-devel mesa-libGL-devel
 
 # Install patchelf