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

bugfix: yarn & jupyter install #60

Merged
merged 3 commits into from
Oct 11, 2021
Merged

bugfix: yarn & jupyter install #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ded4c95
update rstudio config
Oct 8, 2021
681838e
bugfix: yarn
haobibo Oct 11, 2021
1e43b52
typo
haobibo Oct 11, 2021
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
12 changes: 10 additions & 2 deletions docker_atom/work/script-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,10 @@ setup_node() {
&& mv /opt/node* /opt/node \
&& echo "PATH=/opt/node/bin:$PATH" >> /etc/bash.bashrc \
&& export PATH=/opt/node/bin:$PATH \
&& npm install -g npm \
&& npm install -g npm yarn \
&& ln -s /opt/node/bin/* /usr/bin/ \
&& echo "@ Version of Node, npm, and yarn:" `node -v` `npm -v`
&& echo "@ Version of Node, npm, and yarn:" `node -v` `npm -v` \
&& echo "@ Version of Yarn:" `yarn -v`
}


Expand Down Expand Up @@ -98,6 +99,13 @@ setup_R_rstudio() {
&& echo "auth-none=1" >> /etc/rstudio/rserver.conf \
&& echo "auth-minimum-user-id=0" >> /etc/rstudio/rserver.conf \
&& echo "auth-validate-users=0" >> /etc/rstudio/rserver.conf \
&& echo "www-allow-origin=*" >> /etc/rstudio/rserver.conf \
&& echo "www-same-site=none" >> /etc/rstudio/rserver.conf \
&& echo "www-frame-origin=same" >> /etc/rstudio/rserver.conf \
&& echo "www-verify-user-agent=0">> /etc/rstudio/rserver.conf \
&& echo "database-config-file=/etc/rstudio/db.conf" >> /etc/rstudio/rserver.conf \
&& echo "provider=sqlite" >> /etc/rstudio/db.conf \
&& echo "directory=/etc/rstudio/" >> /etc/rstudio/db.conf \
&& printf "USER=root rserver --www-port=8888" > /usr/local/bin/start-rstudio.sh \
&& chmod u+x /usr/local/bin/start-rstudio.sh

Expand Down
5 changes: 4 additions & 1 deletion docker_dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ ARG ARG_KEEP_NODEJS=true
COPY work /opt/utils/

# Setup Jupyter: Basic Configurations and Extensions...
RUN source /opt/utils/script-extend.sh \
RUN mkdir -pv /opt/conda/etc/jupyter/ \
&& mv /opt/utils/jupyter_notebook_config.json /opt/conda/etc/jupyter/ \
&& mv /opt/utils/start-*.sh /usr/local/bin/ && chmod +x /usr/local/bin/start-*.sh \
&& source /opt/utils/script-extend.sh \
&& for profile in $(echo $ARG_PROFILE_JUPYTER | tr "," "\n") ; do ( setup_jupyter_${profile} || true ) ; done

# If not keeping NodeJS, remove NoedJS to reduce image size
Expand Down
6 changes: 1 addition & 5 deletions docker_dev/work/script-extend.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@ source /opt/utils/script-utils.sh
setup_jupyter_base() {
# TEMP fix: nbconvert requires mistune>=0.8.1,<2 for now
pip install -Uq jupyterhub jupyterlab notebook ipywidgets qpod_hub "mistune>=0.8.1,<2" \
&& mkdir -p /opt/conda/etc/jupyter/ \
&& mv /opt/utils/jupyter_notebook_config.json /opt/conda/etc/jupyter/ \
&& jupyter nbextension enable --py widgetsnbextension \
&& echo "@ Version of Yarn:" `yarn -v` \
&& jupyter nbextension enable --py widgetsnbextension \
&& jupyter labextension install @jupyter-widgets/jupyterlab-manager \
&& mv /opt/utils/start-*.sh /usr/local/bin/ && chmod +x /usr/local/bin/start-*.sh \
&& echo "@ Version of Jupyter Notebook/JupyterLab:" \
`jupyter notebook --version` `jupyter lab --version`
}
Expand Down