Merge pull request #5166 from berkeley-dsep-infra/staging

merging 5162/5164/5165 to prod
berkeley-dsep-infra · Oct 26, 2023 · aa12003 · aa12003
2 parents 437ad95 + 8c6faa0
commit aa12003
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 13 deletions.
diff --git a/deployments/data101/image/postBuild b/deployments/data101/image/postBuild
@@ -0,0 +1,15 @@
+#!/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/
+chmod 775 ${CONDA_DIR}/bin/mongosh
+chmod 775 ${CONDA_DIR}/lib/mongosh_crypt_v1.so
+cd /
+rm -rf /tmp/mongosh
diff --git 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
diff --git 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
@@ -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: