Resolve forward-merge release/26.02 into main#849
Resolve forward-merge release/26.02 into main#849AyodeAwe wants to merge 5 commits intorapidsai:mainfrom
Conversation
42b1d44 to
e731c4f
Compare
|
tests are failing here only for Python 3.10:
Since RAPIDS has dropped Python 3.10 support in 26.04, I'm guessing that we're just getting a weird / untested mix of older nightlies and their dependencies. I've merged #850, which removes Python 3.10 here and will hopefully resolve that. Rebasing this branch onto |
e731c4f to
1d43a77
Compare
jameslamb
left a comment
There was a problem hiding this comment.
This is not looking right, we've lost a commit here that is on release/26.02 but not main: 04a3808
At https://github.com/rapidsai/docker/pull/849/commits
Compare to https://github.com/rapidsai/docker/commits/release/26.02/
| SHELL ["/bin/bash", "-euo", "pipefail", "-c"] | ||
| EOF |
There was a problem hiding this comment.
This SHELL in the middle of this heredoc definitely is not right.
It looks to me like maybe you kept both parts of this git conflict? The full thing should look like this:
# --- begin 'rapidsai/miniforge-cuda' --- #
ARG CUDA_VER=notset
ARG LINUX_VER=notset
ARG PYTHON_VER=notset
ARG MINIFORGE_VER=notset
FROM condaforge/miniforge3:${MINIFORGE_VER} AS miniforge-upstream
SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
COPY pinned /opt/conda/conda-meta/pinned
RUN \
--mount=type=bind,source=scripts,target=/tmp/build-scripts \
<<EOF
# update everything in 'base' before we copy files into later targets
/tmp/build-scripts/update-base-conda-environment
EOF
################################ build miniforge-cuda using updated miniforge-upstream from above ###############################| RUN <<EOF | ||
| # Ensure new files are created with group write access & setgid. See https://unix.stackexchange.com/a/12845 | ||
| chmod g+ws /opt/conda | ||
| EOF | ||
|
|
There was a problem hiding this comment.
| RUN <<EOF | |
| # Ensure new files are created with group write access & setgid. See https://unix.stackexchange.com/a/12845 | |
| chmod g+ws /opt/conda | |
| EOF |
Remove this. On main, it's already done in configure-conda-base-environment which is called a few lines below.
docker/context/scripts/configure-conda-base-environment
Lines 14 to 15 in 6f1f788
|
Replaced by #851 |
Address merge conflicts found in the bot's forward merger PR: #845
Conflicts resolved:
Dockerfile- Kept main's refactored scripts approachcontext/.dockerignore- Combined both script files and pinned file entries