Skip to content

Commit e731c4f

Browse files
committed
Merge release/26.02 into main
2 parents 4bb857d + a5c3adb commit e731c4f

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ ARG MINIFORGE_VER=notset
6565

6666
FROM condaforge/miniforge3:${MINIFORGE_VER} AS miniforge-upstream
6767

68+
COPY pinned /opt/conda/conda-meta/pinned
69+
6870
RUN \
6971
--mount=type=bind,source=scripts,target=/tmp/build-scripts \
7072
<<EOF
@@ -94,6 +96,8 @@ EOF
9496
# Ownership & permissions based on https://docs.anaconda.com/anaconda/install/multi-user/#multi-user-anaconda-installation-on-linux
9597
COPY --from=miniforge-upstream --chown=root:conda --chmod=770 /opt/conda /opt/conda
9698

99+
COPY pinned /opt/conda/conda-meta/pinned
100+
97101
RUN \
98102
--mount=type=bind,source=scripts,target=/tmp/build-scripts \
99103
<<EOF
@@ -169,7 +173,6 @@ PACKAGES_TO_INSTALL=(
169173
"cuda-version=${CUDA_VER%.*}.*"
170174
'ipython>=8.37.0'
171175
'rapids-cli==0.1.*'
172-
'openssl==3.6.0'
173176
)
174177
rapids-mamba-retry install -y -n base \
175178
"${PACKAGES_TO_INSTALL[@]}"

context/.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
!cuvs-bench/
55
!entrypoint.sh
66
!notebooks.sh
7+
!pinned
78
!scripts/configure-apt
89
!scripts/configure-conda-base-environment
910
!scripts/install-gha-tools

context/pinned

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
openssl >=3.6.1
2+
wheel >=0.46.2

0 commit comments

Comments
 (0)