Merge pull request #6 from ucsd-ets/wi22

Wi22

Author: wesuuu

.github/workflows/main.yml

@@ -84,11 +84,7 @@ jobs:
         if: >
           !contains(github.base_ref , 'test') &&
           !contains(github.base_ref , 'dev') &&
-          !contains(github.event.head_commit.message , 'skip push') &&
-          (
-            github.ref == 'refs/heads/master' || 
-            github.ref == 'refs/heads/main'
-          )
+          !contains(github.event.head_commit.message , 'skip push')
         env:
           DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
         run: |

images/datahub-base-notebook/Dockerfile

@@ -11,13 +11,14 @@ RUN apt-get update -y && \
     less \
     nano \
     vim \
-    openssh-client \
     cmake \
     tmux \
     screen \
     gnupg \
     htop \
     wget \
+    openssh-client \
+    openssh-server \
     p7zip \
     p7zip-full && \
     apt-get clean && rm -rf /var/lib/apt/lists/* && \

images/scipy-ml-notebook/Dockerfile

@@ -18,7 +18,8 @@ RUN chmod +x /run_jupyter.sh
 USER jovyan
 
 # CUDA 11
-RUN conda install cudatoolkit=11.2 \
+RUN conda install \
+	cudatoolkit=11.2 \
 	cudnn \
 	nccl \
 	-y && \
@@ -34,8 +35,8 @@ RUN pip install --no-cache-dir  datascience \
 	jupyter-tensorboard \
 	opencv-python \
 	pycocotools \
-	"pillow<7" \
-	tensorflow-gpu>=2.2 && \
+	pillow \
+	tensorflow-gpu==2.6 && \
 	fix-permissions $CONDA_DIR && \
 	fix-permissions /home/$NB_USER
 

images/spec.yml

@@ -37,11 +37,8 @@ images:
 
 plans:
   PYTHON39:
-    tag_prefix: '2021.3'
+    tag_prefix: '2022.1'
     tag_stable_postfix: -stable
-  # PYTHON38:
-  #   tag_prefix: '2021.2'
-  #   tag_stable_postfix: -stable
 
 manifests:
   PY_VER: