From db3de8a3ca289383178f5d537d0ecb028b140335 Mon Sep 17 00:00:00 2001 From: RockfordMankiniUCSD <92760584+RockfordMankiniUCSD@users.noreply.github.com> Date: Mon, 18 Sep 2023 07:34:04 -0700 Subject: [PATCH 1/7] Update Dockerfile --- images/datascience-notebook/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/images/datascience-notebook/Dockerfile b/images/datascience-notebook/Dockerfile index 594cd4ff..d7a12f56 100644 --- a/images/datascience-notebook/Dockerfile +++ b/images/datascience-notebook/Dockerfile @@ -82,6 +82,7 @@ RUN pip install jupyterlab==3.0.16 jupyterlab-github jupyterlab-latex jupyterlab RUN pip install dpkt \ nose \ datascience && \ + jupyterhub==3.0.0 && \ python -c 'import matplotlib.pyplot' && \ fix-permissions $CONDA_DIR && \ fix-permissions /home/$NB_USER && \ From 7103d8838f178f3127a44ecac832e44081c907a8 Mon Sep 17 00:00:00 2001 From: RockfordMankiniUCSD <92760584+RockfordMankiniUCSD@users.noreply.github.com> Date: Mon, 18 Sep 2023 08:10:45 -0700 Subject: [PATCH 2/7] Update Dockerfile --- images/datascience-notebook/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/datascience-notebook/Dockerfile b/images/datascience-notebook/Dockerfile index d7a12f56..c2971a6f 100644 --- a/images/datascience-notebook/Dockerfile +++ b/images/datascience-notebook/Dockerfile @@ -78,6 +78,8 @@ RUN pip install jupyterlab==3.0.16 jupyterlab-github jupyterlab-latex jupyterlab jupyterlab-fasta jupyterlab-pullrequests jupyterlab-geojson && \ pip cache purge +RUN pip uninstall jupyterhub -y + # Datascience packages RUN pip install dpkt \ nose \ From c788bfa880fa9760db5f71402550ea80708237fc Mon Sep 17 00:00:00 2001 From: RockfordMankiniUCSD <92760584+RockfordMankiniUCSD@users.noreply.github.com> Date: Mon, 18 Sep 2023 08:26:45 -0700 Subject: [PATCH 3/7] Update spec.yml --- images/spec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/spec.yml b/images/spec.yml index 0c84a55a..5168872e 100644 --- a/images/spec.yml +++ b/images/spec.yml @@ -6,7 +6,7 @@ images: build_args: PYTHON_VERSION: python-3.9.5 PY_VER_SHORT: "3.9" - JUPYTERHUB_VERSION: 1.4.1 + JUPYTERHUB_VERSION: 3.0.0 info_cmds: [PY_VER, PIP_LIST, CONDA_INFO, CONDA_LIST, APT_PKG_LIST] rstudio-notebook: From 5e6934bd050c5f994618e7baa8e4d232faabb318 Mon Sep 17 00:00:00 2001 From: RockfordMankiniUCSD <92760584+RockfordMankiniUCSD@users.noreply.github.com> Date: Mon, 18 Sep 2023 08:27:28 -0700 Subject: [PATCH 4/7] Update Dockerfile --- images/datascience-notebook/Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/images/datascience-notebook/Dockerfile b/images/datascience-notebook/Dockerfile index c2971a6f..a9f65425 100644 --- a/images/datascience-notebook/Dockerfile +++ b/images/datascience-notebook/Dockerfile @@ -77,14 +77,11 @@ ENV JUPYTERHUB_USER=${NB_USER} RUN pip install jupyterlab==3.0.16 jupyterlab-github jupyterlab-latex jupyterlab-git \ jupyterlab-fasta jupyterlab-pullrequests jupyterlab-geojson && \ pip cache purge - -RUN pip uninstall jupyterhub -y - + # Datascience packages RUN pip install dpkt \ nose \ datascience && \ - jupyterhub==3.0.0 && \ python -c 'import matplotlib.pyplot' && \ fix-permissions $CONDA_DIR && \ fix-permissions /home/$NB_USER && \ From c4afd32305efbd1ed37afc64a6082bdba63d8591 Mon Sep 17 00:00:00 2001 From: RockfordMankiniUCSD <92760584+RockfordMankiniUCSD@users.noreply.github.com> Date: Mon, 18 Sep 2023 08:50:35 -0700 Subject: [PATCH 5/7] Update spec.yml --- images/spec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/spec.yml b/images/spec.yml index 5168872e..8fe9b656 100644 --- a/images/spec.yml +++ b/images/spec.yml @@ -12,7 +12,7 @@ images: rstudio-notebook: image_name: ghcr.io/ucsd-ets/rstudio-notebook depend_on: datascience-notebook - integration_tests: true + integration_tests: false info_cmds: [PY_VER, PIP_LIST, CONDA_INFO, CONDA_LIST, APT_PKG_LIST] prune: true From 7c7cd3c39745042ac0a6a97663143f8fcfc5e2be Mon Sep 17 00:00:00 2001 From: Dominic Feliton Date: Mon, 18 Sep 2023 15:03:20 -0700 Subject: [PATCH 6/7] Rewrite selenium_setup.sh, test integration --- images/spec.yml | 2 +- scripts/selenium_setup.sh | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/images/spec.yml b/images/spec.yml index 8fe9b656..5168872e 100644 --- a/images/spec.yml +++ b/images/spec.yml @@ -12,7 +12,7 @@ images: rstudio-notebook: image_name: ghcr.io/ucsd-ets/rstudio-notebook depend_on: datascience-notebook - integration_tests: false + integration_tests: true info_cmds: [PY_VER, PIP_LIST, CONDA_INFO, CONDA_LIST, APT_PKG_LIST] prune: true diff --git a/scripts/selenium_setup.sh b/scripts/selenium_setup.sh index 57ab5e2b..abaa4889 100644 --- a/scripts/selenium_setup.sh +++ b/scripts/selenium_setup.sh @@ -1,23 +1,32 @@ #!/bin/bash # File google-chrome.list allows `apt update` to fetch the latest stable of Chrome -#sudo bash -c "echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' >> /etc/apt/sources.list.d/google-chrome.list" -sudo bash -c "echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.90-1_amd64.deb' >> /etc/apt/sources.list.d/google-chrome.list" +# OLD: sudo bash -c "echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_114.0.5735.90-1_amd64.deb' >> /etc/apt/sources.list.d/google-chrome.list" + +# Prepare chrome repo +wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add - + +echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list sudo apt -y update + # Install latest Chrome -sudo apt -y install google-chrome-stable +sudo apt -y install google-chrome-stable unzip chrome_version=$(grep -iEo "[0-9.]{10,20}" <(google-chrome --version)) echo "The stable Chrome version is: ${chrome_version}" # ISSUE: Chrome driver may not have the same latest version for download # Workaround: fetch the LATEST_RELEASE version available for download -driver_version=$(curl -s -L https://chromedriver.storage.googleapis.com/LATEST_RELEASE_114) +# OLD: driver_version=$(curl -s -L https://chromedriver.storage.googleapis.com/LATEST_RELEASE_114) + +# Download latest chrome driver, instead of above methods +driver_version=$(curl -s -L https://googlechromelabs.github.io/chrome-for-testing/LATEST_RELEASE_STABLE) echo "Latest Chrome driver version is: ${driver_version}" -wget https://chromedriver.storage.googleapis.com/${driver_version}/chromedriver_linux64.zip +# OLD: wget https://chromedriver.storage.googleapis.com/${driver_version}/chromedriver_linux64.zip +wget https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${driver_version}/linux64/chromedriver-linux64.zip # install Chrome Driver -unzip chromedriver_linux64.zip -sudo mv chromedriver /usr/bin/chromedriver +unzip chromedriver-linux64.zip +sudo mv chromedriver-linux64/chromedriver /usr/bin/chromedriver sudo chown root:root /usr/bin/chromedriver sudo chmod +x /usr/bin/chromedriver From df3b960f4098926c18e0a62928aaad3f6c27a89b Mon Sep 17 00:00:00 2001 From: Dominic Feliton <127802411+dafeliton@users.noreply.github.com> Date: Mon, 18 Sep 2023 20:55:19 -0700 Subject: [PATCH 7/7] Revert jhub version --- images/spec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/spec.yml b/images/spec.yml index 5168872e..0c84a55a 100644 --- a/images/spec.yml +++ b/images/spec.yml @@ -6,7 +6,7 @@ images: build_args: PYTHON_VERSION: python-3.9.5 PY_VER_SHORT: "3.9" - JUPYTERHUB_VERSION: 3.0.0 + JUPYTERHUB_VERSION: 1.4.1 info_cmds: [PY_VER, PIP_LIST, CONDA_INFO, CONDA_LIST, APT_PKG_LIST] rstudio-notebook: