rename to 'restricted' + remove jupyter-covid19 changes for now

uc-cdis · Jan 19, 2024 · 7f8ce9d · 7f8ce9d
1 parent 6e9cfec
commit 7f8ce9d
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 16 deletions.
diff --git a/.github/workflows/build_and_push_python_image.yml b/.github/workflows/build_and_push_python_image.yml
@@ -3,7 +3,7 @@ name: Build Python Images and Push to Quay and ECR
 on:
   push:
     paths:
-    - python3.9-data-science/Dockerfile
+    - python3.9-data-science/**
     - .github/workflows/build_and_push_python_image.yml
 
 jobs:

diff --git a/.github/workflows/build_azlinux_jupyter_scipy_image.yml b/.github/workflows/build_azlinux_jupyter_scipy_image.yml
@@ -3,7 +3,7 @@ name: Build and push AmazonLinux jupyter-scipy
 on:
   push:
     paths:
-    - azlinux-jupyter-scipy/Dockerfile
+    - azlinux-jupyter-scipy/**
     - .github/workflows/build_azlinux_jupyter_scipy_image.yml
 
 jobs:

diff --git a/.github/workflows/build_jupyter_nextflow_image.yml b/.github/workflows/build_jupyter_nextflow_image.yml
@@ -3,7 +3,7 @@ name: Build and Push Jupyter-Nextflow image
 on:
   push:
     paths:
-    - jupyter-nextflow
+    - jupyter-nextflow/**
     - .github/workflows/build_jupyter_nextflow_image.yml
 
 jobs:

diff --git a/...d_jupyter_covid19_restricted_download.yml → ...ild_jupyter_restricted_download_image.yml b/...d_jupyter_covid19_restricted_download.yml → ...ild_jupyter_restricted_download_image.yml
@@ -1,21 +1,20 @@
-name: Build and push PRC images
+name: Build and Push jupyter-restricted-download
 
 on:
   push:
     paths:
-    - jupyter-restricted-download/Dockerfile
-    - .github/workflows/build_jupyter_restricted_download.yml
+    - jupyter-restricted-download/**
+    - .github/workflows/build_jupyter_restricted_download_image.yml
 
 jobs:
-  jupyter-covid19-restricted-download:
+  jupyter-restricted-download:
     name: Build and Push jupyter-restricted-download
     uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
     with:
       DOCKERFILE_LOCATION: "./jupyter-restricted-download/Dockerfile"
       DOCKERFILE_BUILD_CONTEXT: "./jupyter-restricted-download"
-      OVERRIDE_REPO_NAME: "jupyter-covid19"
+      OVERRIDE_REPO_NAME: "jupyter-notebook"
       OVERRIDE_TAG_NAME: "restricted-download-$(echo ${GITHUB_REF#refs/*/} | tr / _)"
-      USE_QUAY_ONLY: true
     secrets:
       ECR_AWS_ACCESS_KEY_ID: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
       ECR_AWS_SECRET_ACCESS_KEY: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}

diff --git a/.github/workflows/build_vlmd_submission_python_image.yml b/.github/workflows/build_vlmd_submission_python_image.yml
@@ -1,4 +1,4 @@
-name: Build Python Image and Push to Quay and ECR
+name: Build VLMD Image
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
 
 jobs:
   ci:
-    name: Build Image and Push to Quay
+    name: Build VLMD Image
     uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
     with:
       DOCKERFILE_LOCATION: "./vlmd-submission-tools/Dockerfile"

diff --git a/jupyter-covid19/Dockerfile b/jupyter-covid19/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/cdis/jupyter-restrict-download:1.1.0
+FROM quay.io/cdis/jupyter-notebook:1.1.0
 
 USER $NB_USER
 WORKDIR /home/$NB_USER
@@ -96,6 +96,5 @@ ADD --chown=jovyan:users https://raw.githubusercontent.com/uc-cdis/covid19-tools
 RUN touch /home/$NB_USER/covid19-notebook/peregrine.py
 
 # premade notebooks dependencies
-# RUN pip install --upgrade 'pip<20.3' # pip 20.3 causes dependency resolution issues
-COPY requirements.txt /home/$NB_USER/covid19-notebook/requirements.txt
-RUN pip install -r /home/$NB_USER/covid19-notebook/requirements.txt --upgrade
+RUN pip install --upgrade 'pip<20.3' # pip 20.3 causes dependency resolution issues
+RUN pip install -r /home/$NB_USER/covid19-notebook/requirements.txt
diff --git a/jupyter-restrict-download/.env → jupyter-restricted-download/.env b/jupyter-restrict-download/.env → jupyter-restricted-download/.env
diff --git a/jupyter-restrict-download/Dockerfile → jupyter-restricted-download/Dockerfile b/jupyter-restrict-download/Dockerfile → jupyter-restricted-download/Dockerfile
diff --git a/jupyter-restrict-download/README.md → jupyter-restricted-download/README.md b/jupyter-restrict-download/README.md → jupyter-restricted-download/README.md
@@ -1,3 +1,3 @@
 # jupyter-restricted-download
 
-A "restricted" build of `jupyter-slim`.  Basically the same as `../jupyter-slim/`, but it restricts user to download anything from the jupyter lab
+A "restricted" build of `jupyter-slim`.  Basically the same as `../jupyter-slim/`, but it prevents users from downloading anything from the jupyter lab
diff --git a/...ter-restrict-download/resources/custom.js → ...r-restricted-download/resources/custom.js b/...ter-restrict-download/resources/custom.js → ...r-restricted-download/resources/custom.js
diff --git a/...load/resources/jupyter_notebook_config.py → ...load/resources/jupyter_notebook_config.py b/...load/resources/jupyter_notebook_config.py → ...load/resources/jupyter_notebook_config.py
diff --git a/jupyter-restrict-download/start-notebook.sh → ...ter-restricted-download/start-notebook.sh b/jupyter-restrict-download/start-notebook.sh → ...ter-restricted-download/start-notebook.sh
diff --git a/...ter-restrict-download/start-singleuser.sh → ...r-restricted-download/start-singleuser.sh b/...ter-restrict-download/start-singleuser.sh → ...r-restricted-download/start-singleuser.sh
diff --git a/jupyter-restrict-download/start.sh → jupyter-restricted-download/start.sh b/jupyter-restrict-download/start.sh → jupyter-restricted-download/start.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Build Python Images and Push to Quay and ECR @@
     on:
       push:
         paths:
-        - python3.9-data-science/Dockerfile
+        - python3.9-data-science/**
         - .github/workflows/build_and_push_python_image.yml
     jobs:
@@ Expand Down @@