Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merging 5832/5851/5854/5856/5859/5863/5864/5866/5867/5869/5870/5871/5872/5874/5875/5876/5877/5878 to prod #5860

Merged
merged 48 commits into from
Jul 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
241e384
squelch dependabot
shaneknapp Jul 2, 2024
982f82c
bump urllib3
shaneknapp Jul 2, 2024
a928674
python 3.11
shaneknapp Jul 2, 2024
0610800
fat finger fix
shaneknapp Jul 2, 2024
0fd60c2
bumping requests
shaneknapp Jul 2, 2024
6e3fb74
bump requests here
shaneknapp Jul 2, 2024
2806ced
addresses https://github.com/berkeley-dsep-infra/datahub/security/dep…
shaneknapp Jul 8, 2024
72ebb7f
Add voila and voici package in dashboard image
balajialg Jul 10, 2024
8e6a1c1
Install voici, mystmd and comment out unnecessary packages for dashbo…
balajialg Jul 10, 2024
557772f
Addressing review comments
balajialg Jul 11, 2024
64147f4
Merge pull request #5832 from shaneknapp/dependabot
shaneknapp Jul 12, 2024
9828c7f
remove as its not needed
shaneknapp Jul 12, 2024
af73216
Merge pull request #5854 from shaneknapp/remove-reqs-disabled
shaneknapp Jul 12, 2024
a639156
[DH-323] fixes DH-323
felder Jul 12, 2024
61669a0
Merge pull request #5856 from felder/felder_DH-323
felder Jul 12, 2024
cae646a
pin jupytext on hubs that need it
shaneknapp Jul 15, 2024
04bee0b
bump server proxy for stat159
shaneknapp Jul 15, 2024
2aac624
Merge pull request #5851 from balajialg/voila
balajialg Jul 15, 2024
274d8e4
Merge pull request #5859 from shaneknapp/pin-jupytext
shaneknapp Jul 15, 2024
1582342
Enable gh-scoped-creds based on bcourses profile
balajialg Jul 16, 2024
2382e3a
[DH-325] make webpdf export work
felder Jul 16, 2024
f5c49b0
Merge pull request #5863 from felder/felder_DH-325
felder Jul 16, 2024
6191586
[DH-326] make webpdf export work for eecs
felder Jul 16, 2024
63e0504
Merge pull request #5864 from felder/felder_DH-326
felder Jul 16, 2024
9fd1fa3
[DH-327] make webpdf work for ischool
felder Jul 16, 2024
81dac48
Merge pull request #5866 from felder/felder_DH-327
felder Jul 16, 2024
c264c8e
[DH-328] make webpdf export work for data101
felder Jul 16, 2024
4c7973d
Merge pull request #5867 from felder/felder_DH-328
felder Jul 16, 2024
873598b
[DH-329] make webpdf export work for data102
felder Jul 16, 2024
8f3ab3b
Merge pull request #5868 from felder/felder_DH-329
felder Jul 16, 2024
80fb480
[DH-330] make webpdf export work for julia
felder Jul 16, 2024
5b9d50c
Increase RAM for to 4 GB Data 100 summer assignment
balajialg Jul 16, 2024
afe86d6
[DH-331] make webpdf export work for publichealth
felder Jul 16, 2024
f010d43
Fixing typos
balajialg Jul 16, 2024
6bfe984
Merge pull request #5869 from felder/felder_DH-330
felder Jul 16, 2024
ee57644
[DH-333] making webpdf export work for astro
felder Jul 16, 2024
2637148
Merge pull request #5872 from felder/felder_DH-331
felder Jul 16, 2024
34bc748
Merge pull request #5874 from felder/felder_DH-333
felder Jul 17, 2024
cd1ed2a
[DH-330] adding strace to try and debug 100% cpu issue with chromium
felder Jul 17, 2024
6502fa6
Merge pull request #5875 from felder/felder_DH-330
felder Jul 17, 2024
29247c1
[DH-330] trying dependency install
felder Jul 17, 2024
c49f5e5
Merge pull request #5876 from felder/felder_DH-330
felder Jul 17, 2024
883fe83
[DH-332] make webpdf export work for biology
felder Jul 17, 2024
60bc85e
Merge pull request #5877 from felder/felder_DH-332
felder Jul 17, 2024
1e00803
Merge pull request #5871 from balajialg/data100_su24
balajialg Jul 17, 2024
86af01b
[DH-330] disabling webpdf due to DISPLAY variable being set causing 1…
felder Jul 17, 2024
1388946
Merge pull request #5878 from felder/felder_disable_webpdf_julia
felder Jul 17, 2024
4024b64
Merge pull request #5870 from balajialg/gh-scoped-creds-bcourses
balajialg Jul 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Enable gh-scoped-creds based on bcourses profile
  • Loading branch information
balajialg committed Jul 16, 2024
commit 1582342ac8dcbab0f4df435af51af5843e954ff5
11 changes: 8 additions & 3 deletions deployments/dev/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ jupyterhub:
description: "A newer repo2docker-based image with a primary focus of building dashboards."
kubespawner_override:
image: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-secondary:36280727a
env:
GH_SCOPED_CREDS_CLIENT_ID: "Iv23liFjgKFgkSBWph4C"
GH_SCOPED_CREDS_APP_URL: "https://github.com/apps/test-gh-scoped-creds"
- display_name: "1524699: DataHub Infrastructure"
slug: "1524699"
description: "Regular image with per-course subpath."
Expand All @@ -95,6 +92,14 @@ jupyterhub:

custom:
group_profiles:
# DataHub Infrastructure staff
# https://bcourses.berkeley.edu/courses/1524699/groups#tab-80607
course::1524699::group::all-admins:
mem_limit: 12288M
mem_guarantee: 12288M
env:
GH_SCOPED_CREDS_CLIENT_ID: "Iv23liFjgKFgkSBWph4C"
GH_SCOPED_CREDS_APP_URL: "https://github.com/apps/test-gh-scoped-creds"
#
# # Example: increase memory for everyone affiliated with a course.
#
Expand Down
Loading