From 9d9e0638d626529112c0920347bfb7f48823faa9 Mon Sep 17 00:00:00 2001 From: Lonnie Liu Date: Fri, 15 Nov 2024 23:19:46 +0000 Subject: [PATCH] [image] remove azure packages from base image too ancient; and there are no tests. Signed-off-by: Lonnie Liu --- docker/base-deps/Dockerfile | 13 ++++--------- python/ray/autoscaler/azure/example-full.yaml | 5 ++--- python/ray/autoscaler/azure/example-gpu-docker.yaml | 5 ++--- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/docker/base-deps/Dockerfile b/docker/base-deps/Dockerfile index eec1e564d8c08..5b53760712a8d 100644 --- a/docker/base-deps/Dockerfile +++ b/docker/base-deps/Dockerfile @@ -13,7 +13,7 @@ ENV LANG=C.UTF-8 # TODO(ilr) $HOME seems to point to result in "" instead of "/home/ray" ENV PATH "/home/ray/anaconda3/bin:$PATH" ARG DEBIAN_FRONTEND=noninteractive -ARG PYTHON_VERSION=3.8.16 +ARG PYTHON_VERSION=3.9 ARG HOSTTYPE=${HOSTTYPE:-x86_64} ARG RAY_UID=1000 @@ -39,7 +39,7 @@ RUN sudo apt-get update -y && sudo apt-get upgrade -y \ cmake \ g++ \ zlib1g-dev \ - $(if [ "$AUTOSCALER" = "autoscaler" ]; then echo \ + $(if [[ "$AUTOSCALER" == "autoscaler" ]]; then echo \ tmux \ screen \ rsync \ @@ -74,7 +74,7 @@ RUN sudo apt-get update -y && sudo apt-get upgrade -y \ g++; fi) \ && sudo rm -rf /var/lib/apt/lists/* \ && sudo apt-get clean \ - && (if [ "$AUTOSCALER" = "autoscaler" ]; \ + && (if [[ "$AUTOSCALER" == "autoscaler" ]]; \ then $HOME/anaconda3/bin/pip --no-cache-dir install \ "redis>=3.5.0,<4.0.0" \ "six==1.13.0" \ @@ -83,12 +83,7 @@ RUN sudo apt-get update -y && sudo apt-get upgrade -y \ "cryptography==38.0.1" \ "google-api-python-client==1.7.8" \ "google-oauth" \ - "azure-cli-core==2.40.0" \ - "azure-identity==1.10.0" \ - "azure-mgmt-compute==23.1.0" \ - "azure-mgmt-network==19.0.0" \ - "azure-mgmt-resource==20.0.0" \ - "msrestazure==0.6.4"; \ + ; \ fi;) WORKDIR $HOME diff --git a/python/ray/autoscaler/azure/example-full.yaml b/python/ray/autoscaler/azure/example-full.yaml index a043603bfaaa5..41d7fbfd60d13 100644 --- a/python/ray/autoscaler/azure/example-full.yaml +++ b/python/ray/autoscaler/azure/example-full.yaml @@ -164,9 +164,8 @@ setup_commands: [] # - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl" # Custom commands that will be run on the head node after common setup. -# NOTE: rayproject/ray-ml:latest has azure packages bundled -head_setup_commands: [] - # - pip install -U azure-cli-core==2.22.0 azure-mgmt-compute==14.0.0 azure-mgmt-msi==1.0.0 azure-mgmt-network==10.2.0 azure-mgmt-resource==13.0.0 +head_setup_commands: + - pip install -U azure-cli-core==2.29.1 azure-identity==1.7.0 azure-mgmt-compute==23.1.0 azure-mgmt-network==19.0.0 azure-mgmt-resource==20.0.0 msrestazure==0.6.4 # Custom commands that will be run on worker nodes after common setup. worker_setup_commands: [] diff --git a/python/ray/autoscaler/azure/example-gpu-docker.yaml b/python/ray/autoscaler/azure/example-gpu-docker.yaml index 6faaed48fb643..3ebc763e7d26e 100644 --- a/python/ray/autoscaler/azure/example-gpu-docker.yaml +++ b/python/ray/autoscaler/azure/example-gpu-docker.yaml @@ -117,9 +117,8 @@ setup_commands: [] # - pip install -U "ray[default] @ https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp38-cp38-manylinux2014_x86_64.whl" # Custom commands that will be run on the head node after common setup. -# NOTE: rayproject/ray-ml:latest has azure packages bundled -head_setup_commands: [] - # - pip install -U azure-cli-core==2.22.0 azure-mgmt-compute==14.0.0 azure-mgmt-msi==1.0.0 azure-mgmt-network==10.2.0 azure-mgmt-resource==13.0.0 +head_setup_commands: + - pip install -U azure-cli-core==2.29.1 azure-identity==1.7.0 azure-mgmt-compute==23.1.0 azure-mgmt-network==19.0.0 azure-mgmt-resource==20.0.0 msrestazure==0.6.4 # Custom commands that will be run on worker nodes after common setup. worker_setup_commands: []