Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .ci/docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -462,12 +462,6 @@ if [[ "$image" == *cuda* && ${OS} == "ubuntu" ]]; then
fi
fi

if [[ "$image" == *centos9* ]]; then
DOCKERFILE_NAME="Dockerfile.centos.stream"
else
DOCKERFILE_NAME="Dockerfile"
fi

no_cache_flag=""
progress_flag=""
# Do not use cache and progress=plain when in CI
Expand Down Expand Up @@ -521,7 +515,7 @@ docker build \
--build-arg "ACL=${ACL:-}" \
--build-arg "SKIP_SCCACHE_INSTALL=${SKIP_SCCACHE_INSTALL:-}" \
--build-arg "SKIP_LLVM_SRC_BUILD_INSTALL=${SKIP_LLVM_SRC_BUILD_INSTALL:-}" \
-f $(dirname ${DOCKERFILE})/${DOCKERFILE_NAME} \
-f $(dirname ${DOCKERFILE})/Dockerfile \
-t "$tmp_tag" \
"$@" \
.
Expand Down
18 changes: 9 additions & 9 deletions .ci/docker/centos-rocm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
ARG CENTOS_VERSION

FROM centos:${CENTOS_VERSION}
FROM quay.io/centos/centos:stream${CENTOS_VERSION}

ARG CENTOS_VERSION

# Set AMD gpu targets to build for
ARG PYTORCH_ROCM_ARCH
Expand All @@ -14,20 +13,21 @@ ENV PYTORCH_ROCM_ARCH ${PYTORCH_ROCM_ARCH}
COPY ./common/install_base.sh install_base.sh
RUN bash ./install_base.sh && rm install_base.sh

#Install langpack
RUN yum install -y glibc-langpack-en

# Update CentOS git version
RUN yum -y remove git
RUN yum -y remove git-*
RUN yum -y install https://packages.endpoint.com/rhel/7/os/x86_64/endpoint-repo-1.9-1.x86_64.rpm || \
(yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo-1.9-1.x86_64.rpm && \
sed -i "s/packages.endpoint/packages.endpointdev/" /etc/yum.repos.d/endpoint.repo)
RUN yum install -y git

# Install devtoolset
ARG DEVTOOLSET_VERSION
COPY ./common/install_devtoolset.sh install_devtoolset.sh
RUN bash ./install_devtoolset.sh && rm install_devtoolset.sh
RUN dnf install -y rpmdevtools
ENV BASH_ENV "/etc/profile"

# Install ninja
RUN dnf --enablerepo=crb install -y ninja-build

# (optional) Install non-default glibc version
ARG GLIBC_VERSION
COPY ./common/install_glibc.sh install_glibc.sh
Expand Down Expand Up @@ -56,7 +56,7 @@ RUN if [ -n "${PROTOBUF}" ]; then bash ./install_protobuf.sh; fi
RUN rm install_protobuf.sh
ENV INSTALLED_PROTOBUF ${PROTOBUF}

# (optional) Install vision packages like OpenCV
# (optional) Install vision packages like OpenCV and ffmpeg
ARG VISION
COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./
RUN if [ -n "${VISION}" ]; then bash ./install_vision.sh; fi
Expand Down
120 changes: 0 additions & 120 deletions .ci/docker/centos-rocm/Dockerfile.centos.stream

This file was deleted.