update dockerfile

luweizheng · Aug 8, 2024 · 28cfbe7 · 28cfbe7
1 parent 4032b78
commit 28cfbe7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/docker-cd.yaml b/.github/workflows/docker-cd.yaml
@@ -2,7 +2,7 @@ name: Xorbits CD for DockerHub
 
 on:
  schedule:
- - cron: '0 18 * * *'
+ - cron: '05 7 * * *'
  push:
  tags:
  - '*'
@@ -33,7 +33,7 @@ jobs:
 
  - name: Build and push Docker image
  shell: bash
- if: ${{ github.repository == 'xorbitsai/xorbits' }}
+ # if: ${{ github.repository == 'xorbitsai/xorbits' }}
  env:
  DOCKER_ORG: ${{ secrets.DOCKERHUB_USERNAME }}
  PY_VERSION: ${{ matrix.python-version }}

diff --git a/python/xorbits/deploy/docker/Dockerfile.base b/python/xorbits/deploy/docker/Dockerfile.base
@@ -6,42 +6,43 @@ 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 -c conda-forge -c rapidsai ucx-proc=*=cpu ucx ucx-py ; fi
+ conda install python=3.9 && \
+ 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 -c conda-forge -c rapidsai ucx-proc=*=cpu ucx ucx-py ; fi
+ conda install python=3.10 && \
+ 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
+ conda install python=3.11 && \
+ 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 conda install \
  cython \
  mkl \
- numexpr\<2.8.5 \
+ numexpr \
  psutil \
  scikit-learn \
  sqlalchemy \
  tornado \
  lz4 \
- && /opt/conda/bin/conda install -c conda-forge \
+ && conda install -c conda-forge \
  pyarrow\>=1.0 \
  python-kubernetes \
  jax \
  jaxlib \
  uvloop \
  libnuma \
  && pip install -U pip \
+ && pip install -U "numpy>=1.14.0,<2.0" \
+ && pip install scipy\>=1.9.2 pandas\>=1.5.0 \
  && pip install -U \
  xoscar \
  cloudpickle \
@@ -51,7 +52,7 @@ RUN /opt/conda/bin/conda install \
  s3fs \
  pyopenssl>=23.0.0 \
  datasets \
- && /opt/conda/bin/conda clean --all -f -y
+ && conda clean --all -f -y
 
 ENV NVM_DIR /usr/local/nvm
 ENV NODE_VERSION 14.21.1