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.

Sign up for GitHub

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

Set up ESPM 157 course for FA 24 (Round 2) #5915

Merged
merged 8 commits into from
Aug 12, 2024
Merged

Set up ESPM 157 course for FA 24 (Round 2) #5915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
adf5ed5
Set up ESPM157 for FA 24
balajialg Aug 8, 2024
8f3aac6
Reverting to latest version of code-server
balajialg Aug 8, 2024
4df98e5
revert to the latest nodejs version
balajialg Aug 8, 2024
84e0925
Adding comments
balajialg Aug 8, 2024
6cc6912
Fixing the docker syntax error
balajialg Aug 8, 2024
eeb7b66
Added ESPM specific config in the dockerfile
balajialg Aug 10, 2024
f54548b
adding the extra line in env.yml
balajialg Aug 10, 2024
d86412a
Remove path stanza which is not required
balajialg Aug 12, 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
4 changes: 4 additions & 0 deletions deployments/datahub/config/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,3 +200,7 @@ jupyterhub:
course::1535590: # Data 6, https://github.com/berkeley-dsep-infra/datahub/issues/5847
mem_limit: 2048M
mem_guarantee: 2048M

course::1537045: # ESPM 157, https://github.com/berkeley-dsep-infra/datahub/issues/5914
mem_limit: 4096M
mem_guarantee: 4096M
12 changes: 12 additions & 0 deletions deployments/datahub/images/default/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,18 @@ RUN /usr/local/sbin/connector-text.bash
#COPY connectors/2021-fall-phys-188-288.bash /usr/local/sbin/
#RUN /usr/local/sbin/2021-fall-phys-188-288.bash

#ESPM, FA 24
# https://github.com/berkeley-dsep-infra/datahub/issues/5827
ENV VSCODE_EXTENSIONS=${CONDA_DIR}/share/code-server/extensions
USER root
RUN mkdir -p ${VSCODE_EXTENSIONS} && \
chown -R jovyan:jovyan ${VSCODE_EXTENSIONS}
USER ${NB_USER}
# Install Code Server Jupyter extension
RUN /srv/conda/bin/code-server --extensions-dir ${VSCODE_EXTENSIONS} --install-extension ms-toolsai.jupyter
# Install Code Server Python extension
RUN /srv/conda/bin/code-server --extensions-dir ${VSCODE_EXTENSIONS} --install-extension ms-python.python

# clear out /tmp
USER root
RUN rm -rf /tmp/*
Expand Down
3 changes: 2 additions & 1 deletion deployments/datahub/images/default/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ dependencies:
- rtree==1.2.0

# [DH-319] https://github.com/berkeley-dsep-infra/datahub/issues/5827, ESPM 157
- ibis-framework[pandas]==9.2.0
- ibis-framework[pandas,duckdb]==9.2.0
- jupyterlab_myst==2.4.2

# ATTEMPT TO PUT NEW PACKAGES IN THE CONDA LIST ABOVE FIRST, RATHER THAN PIP
Loading