From 05d85b16680d16267d62d7e9311a1c481b31d37d Mon Sep 17 00:00:00 2001
From: Dawnfz-Lenfeng <2912706234@qq.com>
Date: Sun, 18 Aug 2024 12:38:32 +0800
Subject: [PATCH] fix docker

---
 python/xorbits/deploy/docker/Dockerfile.base | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/python/xorbits/deploy/docker/Dockerfile.base b/python/xorbits/deploy/docker/Dockerfile.base
index a2fcf0368..dcef39cbc 100644
--- a/python/xorbits/deploy/docker/Dockerfile.base
+++ b/python/xorbits/deploy/docker/Dockerfile.base
@@ -4,28 +4,24 @@ FROM ${BASE_CONTAINER} AS base
 
 FROM base AS py3.9-base
 SHELL ["/bin/bash", "-c"]
-ARG PYTHON_VERSION=3.9
 RUN if [ "$PYTHON_VERSION" == "3.9" ] ; then \
-    /opt/conda/bin/conda install --freeze-installed -c conda-forge python=3.9 "numpy>=1.14.0,<1.23.0" scipy\>=1.9.2 pandas\>=1.5.0 && \
+    /opt/conda/bin/conda install python=3.9 && \
     /opt/conda/bin/conda install -c conda-forge -c rapidsai ucx-proc=*=cpu ucx ucx-py ; fi
 
 FROM base AS py3.10-base
 SHELL ["/bin/bash", "-c"]
-ARG PYTHON_VERSION=3.9
 RUN if [ "$PYTHON_VERSION" == "3.10" ] ; then \
-    /opt/conda/bin/conda install --freeze-installed -c conda-forge python=3.10 numpy\>=1.14.0 scipy\>=1.9.2 pandas\>=1.5.0 && \
+    /opt/conda/bin/conda install python=3.10 && \
     /opt/conda/bin/conda install -c conda-forge -c rapidsai ucx-proc=*=cpu ucx ucx-py ; fi
 
 FROM base AS py3.11-base
 SHELL ["/bin/bash", "-c"]
-ARG PYTHON_VERSION=3.9
 RUN if [ "$PYTHON_VERSION" == "3.11" ] ; then \
-    /opt/conda/bin/conda install --freeze-installed -c conda-forge \
-    python=3.11 numpy\>=1.14.0 pandas\>=1.5.0 cython\>=0.29.33 scipy\>=1.9.2 \
-    mkl numexpr psutil scikit-learn sqlalchemy tornado lz4 ; fi
+  /opt/conda/bin/conda install python=3.11 && \
+  /opt/conda/bin/conda install -c conda-forge -c rapidsai ucx-proc=*=cpu ucx ucx-py ; fi
 
 FROM py${PYTHON_VERSION}-base AS final
-RUN /opt/conda/bin/conda install \
+RUN /opt/conda/bin/conda install -c conda-forge --solver classic \
     cython \
     mkl \
     numexpr\<2.8.5 \
@@ -34,7 +30,7 @@ RUN /opt/conda/bin/conda install \
     sqlalchemy \
     tornado \
     lz4 \
-  && /opt/conda/bin/conda install -c conda-forge \
+  && /opt/conda/bin/conda install -c conda-forge --solver classic \
     pyarrow\>=1.0 \
     python-kubernetes \
     jax \
@@ -43,6 +39,9 @@ RUN /opt/conda/bin/conda install \
     libnuma \
   && pip install -U pip \
   && pip install -U \
+    "numpy>=1.14.0,<2.0" \
+    scipy\>=1.9.2 \
+    pandas\>=1.5.0 \
     xoscar \
     cloudpickle \
     azure-storage-blob>=12.18.1 \