diff --git a/.buildkite/_images.rayci.yml b/.buildkite/_images.rayci.yml index 4acc9c855390..269f4b46591b 100644 --- a/.buildkite/_images.rayci.yml +++ b/.buildkite/_images.rayci.yml @@ -28,6 +28,7 @@ steps: PYTHON_VERSION: "{{matrix}}" IMAGE_TYPE: "ray" ARCH_SUFFIX: "" + REQUIREMENTS_FILE: "ray_base_extra_py{{matrix}}.lock" depends_on: raycpubase - name: raycudabase @@ -81,6 +82,7 @@ steps: CUDA_VERSION: "{{matrix.cuda}}" IMAGE_TYPE: "ray" ARCH_SUFFIX: "" + REQUIREMENTS_FILE: "ray_base_extra_py{{matrix.python}}.lock" depends_on: raycudabase - name: ray-llmbase @@ -114,6 +116,7 @@ steps: CUDA_VERSION: "{{matrix.cuda}}" IMAGE_TYPE: "ray-llm" ARCH_SUFFIX: "" + REQUIREMENTS_FILE: "ray_base_extra_py{{matrix.python}}.lock" depends_on: ray-llmbase - name: ray-mlcpubase @@ -141,6 +144,7 @@ steps: PYTHON_VERSION: "{{matrix}}" IMAGE_TYPE: "ray-ml" ARCH_SUFFIX: "" + REQUIREMENTS_FILE: "ray_base_extra_py{{matrix}}.lock" depends_on: ray-mlcpubase - name: ray-mlcudabase @@ -178,6 +182,7 @@ steps: CUDA_VERSION: "{{matrix.cuda}}" IMAGE_TYPE: "ray-ml" ARCH_SUFFIX: "" + REQUIREMENTS_FILE: "ray_base_extra_py{{matrix.python}}.lock" depends_on: ray-mlcudabase - name: ray-slimcpubase diff --git a/.buildkite/linux_aarch64.rayci.yml b/.buildkite/linux_aarch64.rayci.yml index e5273229e523..4cb2dde87df1 100644 --- a/.buildkite/linux_aarch64.rayci.yml +++ b/.buildkite/linux_aarch64.rayci.yml @@ -54,6 +54,7 @@ steps: PYTHON_VERSION: "{{matrix}}" IMAGE_TYPE: "ray" ARCH_SUFFIX: "-aarch64" + REQUIREMENTS_FILE: "ray_base_extra_py{{matrix}}.lock" depends_on: raycpubase-aarch64 - name: raycudabase-aarch64 @@ -109,6 +110,7 @@ steps: CUDA_VERSION: "{{matrix.cuda}}" IMAGE_TYPE: "ray" ARCH_SUFFIX: "-aarch64" + REQUIREMENTS_FILE: "ray_base_extra_py{{matrix.python}}.lock" depends_on: raycudabase-aarch64 - name: ray-core-build-aarch64 diff --git a/ci/raydepsets/configs/rayimg.depsets.yaml b/ci/raydepsets/configs/rayimg.depsets.yaml index 3daaacab2980..bfe1c58e7ca1 100644 --- a/ci/raydepsets/configs/rayimg.depsets.yaml +++ b/ci/raydepsets/configs/rayimg.depsets.yaml @@ -115,3 +115,22 @@ depsets: build_arg_sets: - py39 - py310 + + # Second layer of the ray release images. Contains anyscale cli deps (and others) + # and is a subset of the base extra test deps defined above (release image depset) + - name: ray_base_extra_${PYTHON_SHORT} + operation: subset + source_depset: ray_base_extra_testdeps_${PYTHON_SHORT} + requirements: + - docker/base-deps/requirements.in + - docker/base-extra/requirements.in + output: python/deplocks/base_extra/ray_base_extra_py${PYTHON_VERSION}.lock + append_flags: + - --unsafe-package ray + - --python-version=${PYTHON_VERSION} + - --python-platform=linux + build_arg_sets: + - py39 + - py310 + - py311 + - py312 diff --git a/docker/base-extra/Dockerfile b/docker/base-extra/Dockerfile index 0835c907e17b..77fc4f2df15f 100644 --- a/docker/base-extra/Dockerfile +++ b/docker/base-extra/Dockerfile @@ -8,6 +8,10 @@ ENV TERM=xterm ARG SSH_PORT=5020 +ARG PYTHON_DEPSET + +COPY "$PYTHON_DEPSET" /home/ray/python_depset.lock + RUN <