diff --git a/README.md b/README.md index 4a5d541..4bbc4b0 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,11 @@ export LINUX_VER=ubuntu22.04 export CUDA_VER=12.2.2 export PYTHON_VER=3.11 export ARCH=amd64 +export IMAGE_REPO=ci-conda docker build $(ci/compute-build-args.sh) -f ci-conda.Dockerfile context/ +export IMAGE_REPO=ci-wheel docker build $(ci/compute-build-args.sh) -f ci-wheel.Dockerfile context/ +export IMAGE_REPO=citestwheel docker build $(ci/compute-build-args.sh) -f citestwheel.Dockerfile context/ ``` diff --git a/citestwheel.Dockerfile b/citestwheel.Dockerfile index 510fbb7..3e68e08 100644 --- a/citestwheel.Dockerfile +++ b/citestwheel.Dockerfile @@ -9,6 +9,7 @@ FROM amazon/aws-cli:${AWS_CLI_VER} AS aws-cli FROM ${BASE_IMAGE} ARG CUDA_VER=notset +ARG LINUX_VER=notset ARG PYTHON_VER=notset # Set RAPIDS versions env variables @@ -24,20 +25,46 @@ SHELL ["/bin/bash", "-euo", "pipefail", "-c"] RUN < /etc/apt/apt.conf.d/warnings-as-errors -apt-get update -apt-get install -y software-properties-common -# update git > 2.17 -add-apt-repository ppa:git-core/ppa -y -apt-get update -apt-get upgrade -y -apt-get install -y --no-install-recommends \ - wget curl git jq ssh \ - make build-essential libssl-dev zlib1g-dev \ - libbz2-dev libreadline-dev libsqlite3-dev wget \ - curl llvm libncursesw5-dev xz-utils tk-dev unzip \ - libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev -rm -rf /var/cache/apt/archives /var/lib/apt/lists/* +case "${LINUX_VER}" in + "ubuntu"*) + echo 'APT::Update::Error-Mode "any";' > /etc/apt/apt.conf.d/warnings-as-errors + apt-get update + apt-get install -y software-properties-common + # update git > 2.17 + add-apt-repository ppa:git-core/ppa -y + apt-get update + apt-get upgrade -y + apt-get install -y --no-install-recommends \ + wget curl git jq ssh \ + make build-essential libssl-dev zlib1g-dev \ + libbz2-dev libreadline-dev libsqlite3-dev wget \ + curl llvm libncursesw5-dev xz-utils tk-dev unzip \ + libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev + rm -rf /var/cache/apt/archives /var/lib/apt/lists/* + ;; + "rockylinux"*) + dnf update -y + dnf install -y epel-release + dnf update -y + dnf install -y \ + which wget gcc zlib-devel bzip2 bzip2-devel readline-devel sqlite \ + sqlite-devel xz xz-devel libffi-devel curl git ncurses-devel \ + jq dnf-plugins-core + dnf clean all + pushd tmp + wget https://www.openssl.org/source/openssl-1.1.1k.tar.gz + tar -xzvf openssl-1.1.1k.tar.gz + cd openssl-1.1.1k + ./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib no-shared zlib-dynamic + make + make install + popd + ;; + *) + echo "Unsupported LINUX_VER: ${LINUX_VER}" + exit 1 + ;; +esac EOF # Install pyenv diff --git a/matrix.yaml b/matrix.yaml index 1bd0df1..faa1461 100644 --- a/matrix.yaml +++ b/matrix.yaml @@ -36,10 +36,6 @@ exclude: - CUDA_VER: "11.4.3" IMAGE_REPO: "ci-wheel" - # exclude citestwheel for rockylinux8 - - LINUX_VER: "rockylinux8" - IMAGE_REPO: "citestwheel" - # exclude ci-wheel for ubuntu22.04 - LINUX_VER: "ubuntu22.04" IMAGE_REPO: "ci-wheel"