Merge branch 'update-jupyter-plugin' into 'dev'

Update jupyter plugin

See merge request !4

build_space/Dockerfile.jupyterlab_ubuntu

@@ -130,8 +130,8 @@ RUN echo 'export HF_ENDPOINT=https://hf-mirror.com' >> /etc/bash.bashrc && \
 # 安装jupyterlab插件, 生成sshd配置
 RUN pip3 install jupyterlab==4.0.0
 RUN mkdir -p /tmp/jupyter-extension
-COPY ./jupyter_ext_model-1.0.7-py3-none-any.whl /tmp/jupyter-extension/
-COPY ./jupyter_ext_platform-1.0.11-py3-none-any.whl /tmp/jupyter-extension/
+COPY ./jupyter_ext_model-1.0.10-py3-none-any.whl /tmp/jupyter-extension/
+COPY ./jupyter_ext_platform-1.0.13-py3-none-any.whl /tmp/jupyter-extension/
 COPY ./jupyterlab_language_pack_zh_cn-4.0.post6-py2.py3-none-any.whl /tmp/jupyter-extension/
 COPY ./git_lfs-1.6-py2.py3-none-any.whl /tmp/jupyter-extension/
 COPY ./requirements.txt /tmp/jupyter-extension/

build_space/build_ubuntu.sh

@@ -21,11 +21,11 @@ if [ ! -d "./tmp" ];then
 mkdir tmp
 fi
 if [ "${framework}" == "jupyterlab" ];then
-  cp ./jupyter-extension-install-v3/*.whl ./tmp/
-  cp ./jupyter-extension-install-v3/requirements.txt ./tmp/
+  cp ./jupyter-extension-install-v4/*.whl ./tmp/
+  cp ./jupyter-extension-install-v4/requirements.txt ./tmp/
   cp ./extension.sh ./tmp/
   cp ./jupyter_lab_config.py ./tmp/
-  cp -r ./jupyter-extension-install-v3/static ./tmp/
+  cp -r ./jupyter-extension-install-v4/static ./tmp/
 fi
 if [ "${framework}" == "codeserver" ];then
   cp ./code-server_4.7.0_amd64.deb ./tmp/

build_space/jupyter-extension-install-v3/build_ubuntu.sh → build_space/jupyter-extension-install-v4/build_ubuntu.sh

@@ -21,11 +21,11 @@ if [ ! -d "./tmp" ];then
 mkdir tmp
 fi
 if [ "${framework}" == "jupyterlab" ];then
-  cp ./jupyter-extension-install-v3/*.whl ./tmp/
-  cp ./jupyter-extension-install-v3/requirements.txt ./tmp/
+  cp ./jupyter-extension-install-v4/*.whl ./tmp/
+  cp ./jupyter-extension-install-v4/requirements.txt ./tmp/
   cp ./extension.sh ./tmp/
   cp ./jupyter_lab_config.py ./tmp/
-  cp -r ./jupyter-extension-install-v3/static ./tmp/
+  cp -r ./jupyter-extension-install-v4/static ./tmp/
 fi
 if [ "${framework}" == "codeserver" ];then
   cp ./code-server_4.7.0_amd64.deb ./tmp/

build_space/jupyter-extension-install-v3/requirements.txt → build_space/jupyter-extension-install-v4/requirements.txt

 jupyterlab-language-pack-zh-CN
-jupyter_ext_platform==1.0.11
-jupyter_ext_model==1.0.7
+jupyter_ext_platform==1.0.13
+jupyter_ext_model==1.0.10
 git_lfs==1.6

build_space/jupyter-extension-install-v3/updateJupyterImage_script → build_space/jupyter-extension-install-v4/updateJupyterImage_script

 #!/bin/bash
 
-WORKSPACE="/opt/jupyter-ext/install"
-
+# WORKSPACE="/opt/jupyter-ext/install"
+WORKSPACE=$(pwd)
  
 #循环读取images.txt,并存入list中
 n=0
@@ -95,11 +95,21 @@ do
         echo "image env jupyter cmd path :${jupyter_dir}"
         # docker exec  ${CONTAINER_ID} bash -c "mkdir -p '/opt/conda/bin/';ln -s ${jupyter_dir} /opt/conda/bin/"
         # 卸载之前jupyterlab插件
-        docker exec ${CONTAINER_ID} bash -c "pip uninstall -r /jupyter-ext/requirements.txt"
+        docker exec ${CONTAINER_ID} bash -c "pip uninstall -r /jupyter-ext/uninstall.txt -y"
 
         # 安装jupyterlab插件
-        docker exec ${CONTAINER_ID} bash -c "pip install --no-index --find-links=/jupyter-ext -r /jupyter-ext/requirements.txt;if  pip list | grep -E 'jupyter_ext_dataset' && pip list | grep -E 'jupyter_ext_logo' && pip list | grep -E 'jupyterlab-language-pack-zh-CN' && [ "$(jupyter lab --version | cut -d. -f1)" -gt 2 ];then echo "安装成功";else echo \"安装失败！！ $variable\" | tee /jupyter-ext/errorImages.txt; fi"
-        
+       # 安装 jupyterlab 插件
+docker exec ${CONTAINER_ID} bash -c "
+    pip install --no-index --find-links=/jupyter-ext -r /jupyter-ext/requirements.txt
+    jupyter_version=$(jupyter lab --version | cut -d. -f1)
+    if pip list | grep -E 'jupyter_ext_model' && \
+       pip list | grep -E 'jupyter_ext_platform' && \
+       pip list | grep -E 'jupyterlab-language-pack-zh-CN'; then
+        echo '安装成功'
+    else
+        echo '安装失败！！ $variable' | tee /jupyter-ext/errorImages.txt
+    fi
+" 
         # 禁用splash插件
         docker exec ${CONTAINER_ID} bash -c "jupyter labextension disable @jupyterlab/apputils-extension:splash"
 
@@ -109,11 +119,11 @@ do
         # docker tag $imageId $registryAddr$repository:$imageNewTag
         
         # #推送镜像
-        # docker push $registryAddr$repository:$imageNewTag
+        # docker push $registryAddr$repository:$imageNewTag     
 
         # 删除容器及镜像
-        # docker stop ${CONTAINER_ID}
-        # docker rm ${CONTAINER_ID}
+        docker stop ${CONTAINER_ID}
+        docker rm ${CONTAINER_ID}
         # docker rmi ${imageId}
 
         # 验证命令
@@ -121,4 +131,4 @@ do
         # mkidr -p /opt/conda/bin/;ln -n /usr/bin/jupyter /opt/conda/bin/jupyter ;/opt/conda/bin/jupyter lab --allow-root --ip=0.0.0.0 --port=8080
 done
 echo "jupyter source code update failed:"
-echo $fail_image_array
+echo $fail_image_array
\ No newline at end of file