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

Jump to bottom

Fix problem with building narrbase image #1023

Closed
wants to merge 7 commits into from
Closed

Fix problem with building narrbase image #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ad1ba1b
Update to Jupyter 4.3.2 / IPython 5.2.2
briehl Feb 6, 2017
4b00050
Bumped narrbase-image to 4.6, should build jupyter 4.3.2
briehl Feb 13, 2017
c153659
Bump to jupyter 4.4.0
briehl Feb 14, 2017
7ff6879
bumped dockerfile to use narrbase 4.6
briehl Mar 1, 2017
4b4bf62
Bump jupyter to 4.4.1
briehl Mar 15, 2017
f9a8e12
Bumped version in dockerfile.
briehl Mar 16, 2017
d77d70e
More dockerfile mods and fixes.
briehl Mar 16, 2017
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 Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# Made available under the KBase Open Source License
#

FROM kbase/narrbase:4.5
FROM kbase/narrbase:4.6
MAINTAINER Bill Riehl wjriehl@lbl.gov

EXPOSE 8888
Expand Down
3 changes: 2 additions & 1 deletion kbase-extension/kbase_templates/page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@
moment: 'components/moment/moment',
codemirror: 'components/codemirror',
termjs: 'components/term.js/src/term',
typeahead: 'components/jquery-typeahead/dist/jquery.typeahead'
typeahead: 'components/jquery-typeahead/dist/jquery.typeahead',
custom: '{{static_url("custom/custom")}}',
},
shim: {
underscore: {
Expand Down
12 changes: 8 additions & 4 deletions narrbase-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM kbase/narrprereq:1.1
MAINTAINER William Riehl wjriehl@lbl.gov

ENV JUPYTER_VERSION 4.2.1
ENV IPYWIDGETS_VERSION 5.1.5
ENV JUPYTER_VERSION 4.4.1
ENV IPYWIDGETS_VERSION 6.0.0

RUN mkdir -p /kb/installers

Expand All @@ -11,10 +11,14 @@ ADD https://github.com/jupyter/notebook/archive/${JUPYTER_VERSION}.tar.gz /kb/in

RUN \
curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - && \
apt-get install -y nodejs
apt-get install -y nodejs && \
pip install --upgrade pip && \
pip install setuptools==33.1.1 # https://github.com/pypa/setuptools/issues/942

# Install Jupyter Notebook
RUN cd /kb/installers/jupyter_notebook && tar -xvf notebook-${JUPYTER_VERSION}.tar.gz && cd notebook-${JUPYTER_VERSION} && pip install --pre -e .

# Install IPywidgets
RUN pip install --upgrade six && pip install ipywidgets==${IPYWIDGETS_VERSION} && jupyter nbextension enable --py widgetsnbextension
RUN pip install --upgrade six
RUN pip install ipywidgets==${IPYWIDGETS_VERSION}
RUN jupyter nbextension enable --py widgetsnbextension
2 changes: 1 addition & 1 deletion scripts/build_narrative_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DS=$( date +%Y%m%d%H%M )
NAR_NAME="kbase/narrative"
HEADLESS_NAME="kbase/narrative_headless"
NAR_BASE="kbase/narrbase"
NAR_BASE_VER="4.5"
NAR_BASE_VER="4.6"
NAR_PREREQ="kbase/narrprereq"
NAR_PREREQ_VER="1.1"
WEBROOT_DIR="/kb/deployment/services/kbase-ui"
Expand Down
15 changes: 3 additions & 12 deletions scripts/install_narrative.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,10 @@
# 8. Done!

JUPYTER_NOTEBOOK_INSTALL_DIR=jupyter_notebook
# JUPYTER_NOTEBOOK_REPO=https://github.com/eapearson/notebook
# JUPYTER_NOTEBOOK_TAG=4.2.0-kbase

JUPYTER_NOTEBOOK_REPO=https://github.com/jupyter/notebook
JUPYTER_NOTEBOOK_TAG=4.2.1
JUPYTER_NOTEBOOK_TAG=4.4.1

# IPYWIDGETS_INSTALL_DIR=ipywidgets
# IPYWIDGETS_TAG=5.0.0
IPYWIDGETS_VERSION=6.0.0

PYTHON=python2.7

Expand Down Expand Up @@ -154,12 +150,7 @@ then
# Setup ipywidgets addon
log "Installing ipywidgets using $PYTHON"
console "Installing ipywidgets from directory 'ipywidgets'"
# git clone https://github.com/ipython/ipywidgets
# cd ipywidgets
# git checkout tags/$IPYWIDGETS_TAG
# pip install ipywidgets==$IPYWIDGETS_TAG >> ${logfile} 2>&1
pip install ipywidgets >> ${logfile} 2>&1
# pip install -e . >> ${logfile} 2>&1
pip install ipywidgets==$IPYWIDGETS_VERSION >> ${logfile} 2>&1
fi

# Install Narrative code
Expand Down