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

merging 5093/5097/5098/5100/5101/5102 to prod
berkeley-dsep-infra · Oct 5, 2023 · c6b23e6 · c6b23e6
2 parents bb15794 + e1e8275
commit c6b23e6
Show file tree

Hide file tree

Showing 14 changed files with 134 additions and 512 deletions.
diff --git a/deployments/data101/config/common.yaml b/deployments/data101/config/common.yaml
@@ -189,8 +189,8 @@ jupyterhub:
         - name: mongodb
           mountPath: /data/db
     memory:
-      guarantee: 2G
-      limit: 2G
+      guarantee: 5G
+      limit: 5G
 
   custom:
     group_profiles:

diff --git a/deployments/dev-r/image/Dockerfile b/deployments/dev-r/image/Dockerfile
diff --git a/deployments/dev-r/image/Rprofile.site b/deployments/dev-r/image/Rprofile.site
diff --git a/deployments/dev-r/image/apt.txt b/deployments/dev-r/image/apt.txt
diff --git a/deployments/dev-r/image/class-libs.R b/deployments/dev-r/image/class-libs.R
diff --git a/deployments/dev-r/image/environment.yml b/deployments/dev-r/image/environment.yml
diff --git a/deployments/dev-r/image/infra-requirements.txt b/deployments/dev-r/image/infra-requirements.txt
diff --git a/deployments/dev-r/image/install-mambaforge.bash b/deployments/dev-r/image/install-mambaforge.bash
diff --git a/deployments/dev-r/image/install.R b/deployments/dev-r/image/install.R
diff --git a/deployments/dev-r/image/rsession.conf b/deployments/dev-r/image/rsession.conf