diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 3ec9c946..a0e9a04f 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -1,12 +1,42 @@ # SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +################################ build and update miniforge-upstream ############################### + ARG CUDA_VER=notset ARG LINUX_VER=notset ARG PYTHON_VER=notset ARG MINIFORGE_VER=notset FROM condaforge/miniforge3:${MINIFORGE_VER} AS miniforge-upstream + +ENV PATH=/opt/conda/bin:$PATH + +SHELL ["/bin/bash", "-euo", "pipefail", "-c"] + +# Install latest gha-tools to miniforge for unbuntu +RUN <= 5)) && break; sleep 10; done + apt-get install -y --no-install-recommends wget + wget -q https://github.com/rapidsai/gha-tools/releases/latest/download/tools.tar.gz -O - | tar -xz -C /usr/local/bin + apt-get purge -y wget && apt-get autoremove -y + rm -rf /var/lib/apt/lists/* +EOF + +RUN <==' >> /opt/conda/conda-meta/pinned + +# update everything before other environment changes, to ensure mixing +# an older conda with newer packages still works well +rapids-mamba-retry update --all -y -n base +EOF + +################################ build miniforge-cuda using updated miniforge-upstream from above ############################### + FROM nvidia/cuda:${CUDA_VER}-base-${LINUX_VER} AS miniforge-cuda ARG CUDA_VER @@ -71,18 +101,6 @@ RUN <> /opt/conda/conda-meta/pinned - -# Temporary workaround for deadlocks in unpacking libcurl -# we hardcode this to match the versions in the upstream `miniforge3` image -echo 'libcurl==8.14.1' >> /opt/conda/conda-meta/pinned - -# update everything before other environment changes, to ensure mixing -# an older conda with newer packages still works well -rapids-mamba-retry update --all -y -n base - # install expected Python version PYTHON_MAJOR_VERSION=${PYTHON_VERSION%%.*} PYTHON_MINOR_VERSION=${PYTHON_VERSION#*.} diff --git a/versions.yaml b/versions.yaml index 366164dd..07ea681f 100644 --- a/versions.yaml +++ b/versions.yaml @@ -13,4 +13,4 @@ YQ_VER: 4.48.1 # renovate: datasource=github-releases depName=aws/aws-cli AWS_CLI_VER: 2.28.1 # renovate: datasource=docker depName=condaforge/miniforge3 versioning=docker -MINIFORGE_VER: 25.3.1-0 +MINIFORGE_VER: 25.9.1-0