Skip to content

Change jupyter image start command #2558

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

Merged
merged 9 commits into from
Jun 29, 2020
Merged

Change jupyter image start command #2558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
efdeeef
Minimize sqlflow:mysql image
lhw362950217 Jun 23, 2020
58c8edc
fix ci
lhw362950217 Jun 24, 2020
3164e02
Merge https://github.com/sql-machine-learning/sqlflow into minimize_d…
lhw362950217 Jun 28, 2020
27350d3
minimize jupyter image size
lhw362950217 Jun 28, 2020
fda415a
modify doc
lhw362950217 Jun 28, 2020
f9591b8
Merge https://github.com/sql-machine-learning/sqlflow into minimize_d…
lhw362950217 Jun 29, 2020
f91348d
change jupyter startup cmd
lhw362950217 Jun 29, 2020
cb937e2
add jupyterhub in jupyter image
lhw362950217 Jun 29, 2020
00d8541
set jupyterhub version
lhw362950217 Jun 29, 2020
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
2 changes: 1 addition & 1 deletion doc/run/k8s/install-sqlflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
- containerPort: 8888
name: notebook
command:
- bash
- sh
- -c
- 'export SQLFLOW_DATASOURCE=mysql://root:root@tcp\(${MY_POD_IP}:3306\)/?maxAllowedPacket=0 && jupyter notebook --ip=0.0.0.0 --port=8888 --allow-root --NotebookApp.token=""'
env:
Expand Down
5 changes: 4 additions & 1 deletion docker/jupyter/install-jupyter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,19 @@ set -e
wget -q http://cdn.sqlflow.tech/alpine/py3-pandas-1.0.3-r0.apk
wget -q -P /etc/apk/keys/ http://cdn.sqlflow.tech/alpine/sqlflow-5ef80180.rsa.pub
apk add py3-pandas-1.0.3-r0.apk && rm py3-pandas-1.0.3-r0.apk
# Dependencies for jupyterhub
apk add py3-cryptography py3-ruamel.yaml.clib py3-requests

pip -q install \
jupyterhub==1.1.0 \
notebook \
sqlflow==0.10.0

# Load SQLFlow's Jupyter magic command
# automatically. c.f. https://stackoverflow.com/a/32683001.
IPYTHON_STARTUP="/root/.ipython/profile_default/startup/"
mkdir -p "$IPYTHON_STARTUP"
mkdir -p /workspace
mkdir -p /workspace/jupyter
{ echo 'get_ipython().magic(u"%reload_ext sqlflow.magic")';
echo 'get_ipython().magic(u"%reload_ext autoreload")';
echo 'get_ipython().magic(u"%autoreload 2")'; } \
Expand Down
4 changes: 2 additions & 2 deletions docker/jupyterhub/jupyterhub_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@
'Brings SQL and AI together. <a href="https://sqlflow.org">https://sqlflow.org</a>'
}]
c.KubeSpawner.cmd = [
"bash", "-c",
"sh", "-c",
"export SQLFLOW_DATASOURCE=mysql://root:root@tcp\(${MY_POD_IP}:3306\)/?maxAllowedPacket=0 && \
export SQLFLOW_SERVER=${SQLFLOW_SERVER_SERVICE_HOST}:${SQLFLOW_SERVER_SERVICE_PORT} && start-notebook.sh"
export SQLFLOW_SERVER=${SQLFLOW_SERVER_SERVICE_HOST}:${SQLFLOW_SERVER_SERVICE_PORT} && jupyterhub-singleuser jupyter notebook --ip=0.0.0.0 --port=8888 --allow-root --notebook-dir=/workspace/"
]

c.KubeSpawner.extra_containers = [{
Expand Down