升级20240801版本

Author: data-infra

images/jupyter-notebook/Dockerfile-ubuntu-conda

@@ -4,11 +4,13 @@ FROM $FROM_IMAGES
 
 ARG PYTHONVERSION
 ARG CONDAENV
+ARG CUDAVERSION=cu118
+ARG TARGETARCH=amd64
 
-RUN apt update
 ENV TZ Asia/Shanghai
 ENV DEBIAN_FRONTEND noninteractive
 
+RUN apt update -y
 # 安装运维工具
 RUN apt install -y -f --no-install-recommends vim apt-transport-https gnupg2 ca-certificates-java rsync jq  wget git dnsutils iputils-ping net-tools curl mysql-client locales zip unzip nginx lsof
 
@@ -24,10 +26,18 @@ RUN echo "alias ll='ls -alF'" >> /root/.bashrc && \
 	echo "alias vi='vim'" >> /root/.bashrc && \
 	/bin/bash -c "source /root/.bashrc"
 
-# 安装anaconda
-RUN wget https://mirrors.tuna.tsinghua.edu.cn/anaconda/miniconda/Miniconda3-latest-Linux-x86_64.sh && \
-    mkdir /root/.conda && bash Miniconda3-latest-Linux-x86_64.sh -b && \
-    rm -f Miniconda3-latest-Linux-x86_64.sh
+# 安装amd64的conda
+RUN if [ "$TARGETARCH" = "amd64" ]; then \
+    wget https://mirrors.tuna.tsinghua.edu.cn/anaconda/miniconda/Miniconda3-latest-Linux-x86_64.sh; \
+    mkdir /root/.conda && bash Miniconda3-latest-Linux-x86_64.sh -b ; \
+    rm -f Miniconda3-latest-Linux-x86_64.sh ; \
+fi
+# 安装arm64的conda
+RUN if [ "$TARGETARCH" = "arm64" ]; then \
+     wget https://mirrors.tuna.tsinghua.edu.cn/anaconda/miniconda/Miniconda3-latest-Linux-aarch64.sh ; \
+    mkdir /root/.conda && bash Miniconda3-latest-Linux-aarch64.sh -b ; \
+    rm -f Miniconda3-latest-Linux-aarch64.sh ; \
+fi
 
 # 激活python3
 ENV PATH "/root/miniconda3/bin":$PATH
@@ -45,10 +55,11 @@ RUN apt install -y openssh-server openssh-client
 
 # 安装
 RUN apt install -y -f python3-opencv ffmpeg
+COPY pip.conf /root/.pip/pip.conf
 RUN pip3 install celery redis pyarrow requests_toolbelt cryptography tqdm fsspec aiohttp librosa flask werkzeug requests tornado Pillow pysnooper opencv-python numpy scipy matplotlib scikit-image ipython pyyaml visualdl filelock && rm -rf ~/.cache
 
-RUN pip install --upgrade pip && pip install tornado==6.2 gsutil simplejson sqlalchemy joblib scikit-learn jinja2 requests numpy pandas flask pymysql pysnooper pyyaml jupyterlab==3.4.8 voila notebook==6.4.12 && rm -rf /tmp/* /var/tmp/* /root/.cache \
-
+RUN pip install --upgrade pip && pip install tornado==6.2 gsutil simplejson sqlalchemy joblib scikit-learn jinja2 requests numpy pandas flask pymysql pysnooper pyyaml jupyterlab==3.4.8 voila notebook==6.4.12 && rm -rf /tmp/* /var/tmp/* /root/.cache
+RUN pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/${CUDAVERSION} && rm -rf /tmp/* /var/tmp/* /root/.cache
 #RUN jupyter labextension install @jupyter-widgets/jupyterlab-manager
 #RUN pip install --upgrade jupyterlab-git jupyterlab_tensorboard_pro && jupyter lab build && jupyter labextension install jupyterlab_tensorboard_pro && jupyter serverextension enable jupyterlab_tensorboard_pro --sys-prefix
 

images/jupyter-notebook/build.sh

@@ -1,12 +1,18 @@
 set -ex
+TARGETARCH=amd64
 
 hubhost=ccr.ccs.tencentyun.com/cube-studio
-base_image=ubuntu:22.04
-docker build -t $hubhost/notebook:jupyter-ubuntu22.04 --build-arg FROM_IMAGES=$base_image --build-arg PYTHONVERSION=3.8 --build-arg CONDAENV=python38 -f Dockerfile-ubuntu-conda .
-docker push $hubhost/notebook:jupyter-ubuntu22.04
 
-base_image=nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04
-docker build -t $hubhost/notebook:jupyter-ubuntu22.04-cuda11.8.0-cudnn8 --build-arg FROM_IMAGES=$base_image --build-arg PYTHONVERSION=3.8 --build-arg CONDAENV=python38 -f Dockerfile-ubuntu-conda .
-docker push $hubhost/notebook:jupyter-ubuntu22.04-cuda11.8.0-cudnn8
+base_image=ubuntu:20.04
+docker build --network=host -t $hubhost/notebook-enterprise:jupyter-ubuntu-cpu-conda-$TARGETARCH --build-arg FROM_IMAGES=$base_image --build-arg PYTHONVERSION=3.9 --build-arg CONDAENV=python39 --build-arg TARGETARCH=$TARGETARCH -f Dockerfile-ubuntu-conda .
+docker push $hubhost/notebook-enterprise:jupyter-ubuntu-cpu-conda-$TARGETARCH
+
+base_image=nvidia/cuda:11.8.0-cudnn8-devel-ubuntu20.04
+docker build --network=host -t $hubhost/notebook-enterprise:jupyter-ubuntu-gpu-conda-$TARGETARCH --build-arg FROM_IMAGES=$base_image --build-arg PYTHONVERSION=3.9 --build-arg CONDAENV=python39 --build-arg TARGETARCH=$TARGETARCH --build-arg CUDAVERSION=cu118 -f Dockerfile-ubuntu-conda .
+docker push $hubhost/notebook-enterprise:jupyter-ubuntu-gpu-conda-$TARGETARCH
+
+base_image=nvidia/cuda:12.1.0-cudnn8-devel-ubuntu20.04
+docker build --network=host -t $hubhost/notebook-enterprise:jupyter-ubuntu-gpu-conda-12.1.0-cudnn8-$TARGETARCH --build-arg FROM_IMAGES=$base_image --build-arg PYTHONVERSION=3.9 --build-arg CONDAENV=python39 --build-arg TARGETARCH=$TARGETARCH --build-arg CUDAVERSION=cu121 -f Dockerfile-ubuntu-conda .
+docker push $hubhost/notebook-enterprise:jupyter-ubuntu-gpu-conda-12.1.0-cudnn8-$TARGETARCH
 
 

images/jupyter-notebook/init.sh

@@ -9,8 +9,10 @@ echo root:cube-studio | chpasswd
 service ssh restart
 # 客户端连接命令，    ssh -p ${SSH_PORT} root@${SERVICE_EXTERNAL_IP}
 
+#sed -i "s/Host cube-studio/Host ${NOTEBOOK_NAME}/g" /examples/ssh连接
 sed -i "s/localhost/${SERVICE_EXTERNAL_IP}/g" /examples/ssh连接
 sed -i "s/localport/${SSH_PORT}/g" /examples/ssh连接
+sed -i "s/hostname/cube-studio-${NOTEBOOK_NAME}/g" /examples/ssh连接
 
 # 配置example
 ln -s /examples /mnt/${USERNAME}/

images/jupyter-notebook/pip.conf

@@ -0,0 +1,2 @@
+[global]
+index-url = https://mirrors.aliyun.com/pypi/simple

images/jupyter-notebook/readme.md

@@ -22,8 +22,8 @@ vscode镜像的构建在：https://github.com/tencentmusic/cube-studio/tree/mast
 NOTEBOOK_IMAGES=[
     ['ccr.ccs.tencentyun.com/cube-studio/notebook:vscode-ubuntu-cpu-base', 'vscode（cpu）'],
     ['ccr.ccs.tencentyun.com/cube-studio/notebook:vscode-ubuntu-gpu-base', 'vscode（gpu）'],
-    ['ccr.ccs.tencentyun.com/cube-studio/notebook:jupyter-ubuntu22.04', 'jupyter（cpu）'],
-    ['ccr.ccs.tencentyun.com/cube-studio/notebook:jupyter-ubuntu22.04-cuda11.8.0-cudnn8','jupyter（gpu）'],
+    ['ccr.ccs.tencentyun.com/cube-studio/notebook:jupyter-ubuntu-cpu-base', 'jupyter（cpu）'],
+    ['ccr.ccs.tencentyun.com/cube-studio/notebook:jupyter-ubuntu-gpu-base','jupyter（gpu）'],
     ['ccr.ccs.tencentyun.com/cube-studio/notebook:jupyter-ubuntu-bigdata', 'jupyter（bigdata）'],
     ['ccr.ccs.tencentyun.com/cube-studio/notebook:jupyter-ubuntu-machinelearning', 'jupyter（machinelearning）'],
     ['ccr.ccs.tencentyun.com/cube-studio/notebook:jupyter-ubuntu-deeplearning', 'jupyter（deeplearning）'],
@@ -34,7 +34,7 @@ NOTEBOOK_IMAGES=[
 也可以直接run一个容器，然后安装插件后将容器commmit成镜像。
 ```
 # 启动jupyter
-docker run --name jupyter -p 3000:3000 -d ccr.ccs.tencentyun.com/cube-studio/notebook:jupyter-ubuntu22.04 jupyter lab --notebook-dir=/ --ip=0.0.0.0 --no-browser --allow-root --port=3000 --NotebookApp.token='' --NotebookApp.password='' --NotebookApp.allow_origin='*'
+docker run --name jupyter -p 3000:3000 -d ccr.ccs.tencentyun.com/cube-studio/notebook:jupyter-ubuntu-cpu-base jupyter lab --notebook-dir=/ --ip=0.0.0.0 --no-browser --allow-root --port=3000 --NotebookApp.token='' --NotebookApp.password='' --NotebookApp.allow_origin='*'
 
 # 启动vscode
 docker run --name vscode -p 3000:3000 -d ccr.ccs.tencentyun.com/cube-studio/notebook:vscode-ubuntu-cpu-base node /home/theia/src-gen/backend/main.js /home/project --hostname=0.0.0.0 --port=3000

images/mul-cuda/ubuntu/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t ccr.ccs.tencentyun.com/cube-studio/gpu:ubuntu18.04-python3.6-cuda10.1-cuda10.0-cuda9.0-cudnn7.6 .
+# docker build --network=host -t ccr.ccs.tencentyun.com/cube-studio/gpu:ubuntu18.04-python3.6-cuda10.1-cuda10.0-cuda9.0-cudnn7.6 .
 
 FROM ccr.ccs.tencentyun.com/cube-studio/gpu:ubuntu18.04-python3.6-cuda10.1-cuda10.0-cuda9.0-cudnn7.6-base
 WORKDIR /

images/mul-cuda/ubuntu/Dockerfile-base

@@ -1,5 +1,5 @@
 
-# docker build -t ccr.ccs.tencentyun.com/cube-studio/gpu:ubuntu18.04-python3.6-cuda10.1-cuda10.0-cuda9.0-cudnn7.6-base .
+# docker build --network=host -t ccr.ccs.tencentyun.com/cube-studio/gpu:ubuntu18.04-python3.6-cuda10.1-cuda10.0-cuda9.0-cudnn7.6-base .
 
 # 手动安装了各种cuda
 # https://developer.nvidia.com/cuda-toolkit-archive    安装不上

images/ubuntu-gpu/cuda/python/Dockerfile

@@ -10,6 +10,6 @@ RUN set -x; rm -rf /usr/bin/python /usr/bin/python3; apt install -y --fix-missin
 RUN bash -c "wget https://bootstrap.pypa.io/get-pip.py && python get-pip.py --ignore-installed" \
     && rm -rf /usr/bin/pip && ln -s /usr/bin/pip3 /usr/bin/pip
 
-RUN pip install -U pip && pip install flask requests kubernetes numpy pandas tornado pysnooper
+RUN pip install -U pip && pip install flask requests kubernetes numpy pandas tornado pysnooper redis
 
 

install/docker/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t ccr.ccs.tencentyun.com/cube-studio/kubeflow-dashboard:2024.07.01 -f install/docker/Dockerfile .
+# docker build -t ccr.ccs.tencentyun.com/cube-studio/kubeflow-dashboard:2024.08.01 -f install/docker/Dockerfile .
 
 FROM ccr.ccs.tencentyun.com/cube-studio/kubeflow-dashboard:base-python3.9-amd64-20231001
 

install/docker/Dockerfile-base

@@ -34,9 +34,9 @@ ENV LC_ALL zh_CN.UTF-8
 ENV LANGUAGE zh_CN.UTF-8
 
 # 便捷操作
-RUN echo "alias ll='ls -alF'" >> /etc/profile && \
-	echo "alias la='ls -A'" >> /etc/profile && \
-	echo "alias vi='vim'" >> /etc/profile
+RUN echo "alias ll='ls -alF'" >> ~/.bashrc && \
+	echo "alias la='ls -A'" >> ~/.bashrc && \
+	echo "alias vi='vim'" >> ~/.bashrc
 
 COPY install/docker/requirements.txt /requirements.txt