From a3594d9fb2aa70097ccb9f3858ec4da9d8ecbb9a Mon Sep 17 00:00:00 2001 From: Balaji Alwar Date: Mon, 23 Oct 2023 10:58:40 -0700 Subject: [PATCH 1/7] Increase RAM for Econ 144 admins --- deployments/datahub/config/common.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml index ad8b5e774..0863fc405 100644 --- a/deployments/datahub/config/common.yaml +++ b/deployments/datahub/config/common.yaml @@ -203,3 +203,7 @@ jupyterhub: course::1527878: # Music 30, Fall 2023, issue #5153 mem_limit: 2048M mem_guarantee: 2048M + # Econ 144, Fall 2023, issue #5161 + course::1530164::enrollment_type::teacher: + mem_limit: 2048M + mem_guarantee: 2048M From dccbf2f421ac8f017d720e3b78346ab3150733dd Mon Sep 17 00:00:00 2001 From: shane knapp Date: Tue, 24 Oct 2023 12:16:15 -0700 Subject: [PATCH 2/7] fix dependabot alert --- .../node-placeholder-scaler/requirements.in | 3 ++- .../node-placeholder-scaler/requirements.txt | 26 ++++++++++--------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/images/node-placeholder-scaler/requirements.in b/images/node-placeholder-scaler/requirements.in index f766bce69..63da1e2a9 100644 --- a/images/node-placeholder-scaler/requirements.in +++ b/images/node-placeholder-scaler/requirements.in @@ -1,5 +1,6 @@ certifi==2023.7.22 DateTime -ical +ical==5.0.0 requests ruamel.yaml +urllib3==2.0.7 diff --git a/images/node-placeholder-scaler/requirements.txt b/images/node-placeholder-scaler/requirements.txt index 2d26013d4..1b3ef19a6 100644 --- a/images/node-placeholder-scaler/requirements.txt +++ b/images/node-placeholder-scaler/requirements.txt @@ -4,49 +4,51 @@ # # pip-compile requirements.in # -annotated-types==0.5.0 +annotated-types==0.6.0 # via pydantic certifi==2023.7.22 # via # -r requirements.in # requests -charset-normalizer==3.2.0 +charset-normalizer==3.3.1 # via requests datetime==5.2 # via -r requirements.in -emoji==2.7.0 +emoji==2.8.0 # via ical ical==5.0.0 # via -r requirements.in idna==3.4 # via requests -pydantic==2.1.1 +pydantic==2.4.2 # via ical -pydantic-core==2.4.0 +pydantic-core==2.10.1 # via pydantic pyparsing==3.1.1 # via ical python-dateutil==2.8.2 # via ical -pytz==2023.3 +pytz==2023.3.post1 # via datetime requests==2.31.0 # via -r requirements.in -ruamel-yaml==0.17.32 +ruamel-yaml==0.18.2 # via -r requirements.in -ruamel-yaml-clib==0.2.7 +ruamel-yaml-clib==0.2.8 # via ruamel-yaml six==1.16.0 # via python-dateutil -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # pydantic # pydantic-core tzdata==2023.3 # via ical -urllib3==2.0.4 - # via requests -zope-interface==6.0 +urllib3==2.0.7 + # via + # -r requirements.in + # requests +zope-interface==6.1 # via datetime # The following packages are considered to be unsafe in a requirements file: From 7937196955b9ae41cb718bea97ff700e36e919af Mon Sep 17 00:00:00 2001 From: Jonathan Felder Date: Tue, 24 Oct 2023 12:35:22 -0700 Subject: [PATCH 3/7] [DH-160] install mongosh --- deployments/data101/image/postBuild | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 deployments/data101/image/postBuild diff --git a/deployments/data101/image/postBuild b/deployments/data101/image/postBuild new file mode 100755 index 000000000..5d833d06d --- /dev/null +++ b/deployments/data101/image/postBuild @@ -0,0 +1,16 @@ +#!/usr/bin/bash +set -e + +# install mongosh for DH-160 + +sudo apt-get install -y gnupg curl + +curl -fsSL https://pgp.mongodb.com/server-7.0.asc | \ + sudo gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg \ + --dearmor + +echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-7.0.list + +sudo apt-get update + +sudo apt-get install -y mongodb-mongosh mongodb-org-tools From 04ecdada74f167fe971c92cc0afcef74c9ab5c77 Mon Sep 17 00:00:00 2001 From: Jonathan Felder Date: Tue, 24 Oct 2023 12:49:15 -0700 Subject: [PATCH 4/7] removing sudo --- deployments/data101/image/postBuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deployments/data101/image/postBuild b/deployments/data101/image/postBuild index 5d833d06d..0f869c17e 100755 --- a/deployments/data101/image/postBuild +++ b/deployments/data101/image/postBuild @@ -3,14 +3,14 @@ set -e # install mongosh for DH-160 -sudo apt-get install -y gnupg curl +apt-get install -y gnupg curl curl -fsSL https://pgp.mongodb.com/server-7.0.asc | \ - sudo gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg \ + gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg \ --dearmor -echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-7.0.list +echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-7.0.list -sudo apt-get update +apt-get update -sudo apt-get install -y mongodb-mongosh mongodb-org-tools +apt-get install -y mongodb-mongosh mongodb-org-tools From 70791e9ff0b30c3e5a4e3be222028d46285da882 Mon Sep 17 00:00:00 2001 From: Jonathan Felder Date: Tue, 24 Oct 2023 13:12:51 -0700 Subject: [PATCH 5/7] Trying postBuildAdmin --- deployments/data101/image/{postBuild => postBuildAdmin} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename deployments/data101/image/{postBuild => postBuildAdmin} (100%) diff --git a/deployments/data101/image/postBuild b/deployments/data101/image/postBuildAdmin similarity index 100% rename from deployments/data101/image/postBuild rename to deployments/data101/image/postBuildAdmin From 05ad7abf77ce70f5687b01ed1d2da2aea0eb1f05 Mon Sep 17 00:00:00 2001 From: Jonathan Felder Date: Tue, 24 Oct 2023 13:47:46 -0700 Subject: [PATCH 6/7] trying install via user space --- deployments/data101/image/postBuild | 13 +++++++++++++ deployments/data101/image/postBuildAdmin | 16 ---------------- 2 files changed, 13 insertions(+), 16 deletions(-) create mode 100755 deployments/data101/image/postBuild delete mode 100755 deployments/data101/image/postBuildAdmin diff --git a/deployments/data101/image/postBuild b/deployments/data101/image/postBuild new file mode 100755 index 000000000..7c4e42ceb --- /dev/null +++ b/deployments/data101/image/postBuild @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +set -eux + +# install mongosh for DH-160 + +mkdir -p /tmp/mongosh +cd /tmp/mongosh +wget https://downloads.mongodb.com/compass/mongosh-2.0.2-linux-x64.tgz +tar xvfz mongosh-2.0.2-linux-x64.tgz +cp -v mongosh-2.0.2-linux-x64/bin/mongosh ${CONDA_DIR}/bin/ +cp -v mongosh-2.0.2-linux-x64/bin/mongosh_crypt_v1.so ${CONDA_DIR}/lib/ +cd / +rm -rf /tmp/mongosh diff --git a/deployments/data101/image/postBuildAdmin b/deployments/data101/image/postBuildAdmin deleted file mode 100755 index 0f869c17e..000000000 --- a/deployments/data101/image/postBuildAdmin +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/bash -set -e - -# install mongosh for DH-160 - -apt-get install -y gnupg curl - -curl -fsSL https://pgp.mongodb.com/server-7.0.asc | \ - gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg \ - --dearmor - -echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-7.0.list - -apt-get update - -apt-get install -y mongodb-mongosh mongodb-org-tools From e30073a6e86a828d05840e71ffaf082bea1a8e1b Mon Sep 17 00:00:00 2001 From: Jonathan Felder Date: Tue, 24 Oct 2023 14:01:50 -0700 Subject: [PATCH 7/7] adding chmod just in case --- deployments/data101/image/postBuild | 2 ++ 1 file changed, 2 insertions(+) mode change 100755 => 100644 deployments/data101/image/postBuild diff --git a/deployments/data101/image/postBuild b/deployments/data101/image/postBuild old mode 100755 new mode 100644 index 7c4e42ceb..27148da8a --- a/deployments/data101/image/postBuild +++ b/deployments/data101/image/postBuild @@ -9,5 +9,7 @@ wget https://downloads.mongodb.com/compass/mongosh-2.0.2-linux-x64.tgz tar xvfz mongosh-2.0.2-linux-x64.tgz cp -v mongosh-2.0.2-linux-x64/bin/mongosh ${CONDA_DIR}/bin/ cp -v mongosh-2.0.2-linux-x64/bin/mongosh_crypt_v1.so ${CONDA_DIR}/lib/ +chmod 775 ${CONDA_DIR}/bin/mongosh +chmod 775 ${CONDA_DIR}/lib/mongosh_crypt_v1.so cd / rm -rf /tmp/mongosh