Merge pull request #2 from uw-it-aca/pm-RTTL-43_update_z2jh

updated all notebooks to use 1.3 Jupyter version

Author: paulkm

README.md

@@ -1,2 +1,6 @@
 # rttl-notebooks
 Docker images for base RTTL notebooks
+
+Running notebook locally
+- `docker run -p 8888:8888 gcr.io/uwit-mci-axdd/<image_name>:<image_tag>`
+- Console output will include localhost url with access token. Add '/lab' to the end of the path portion

datascience/Dockerfile

@@ -1,4 +1,5 @@
-ARG BASE_CONTAINER=jupyter/datascience-notebook:d990a62010ae
+ARG BASE_CONTAINER=jupyter/datascience-notebook:hub-1.3.0
+
 FROM $BASE_CONTAINER
 
 LABEL maintainer="UW-IT AXDD <[email protected]>"

datascience/Makefile

@@ -4,7 +4,7 @@ APP_BIN?=app
 default: build
 
 DOCKER_REPO?=gcr.io/uwit-mci-axdd/rttl-datascience-notebook
-DOCKER_TAG?=d990a62010ae
+DOCKER_TAG?=latest_1-3
 
 build:
 	docker build -t $(DOCKER_REPO):latest -t $(DOCKER_REPO):$(DOCKER_TAG) .

r/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=jupyter/r-notebook:d990a62010ae
+ARG BASE_CONTAINER=jupyter/r-notebook:hub-1.3.0
 FROM $BASE_CONTAINER
 
 LABEL maintainer="UW-IT AXDD <[email protected]>"

r/Makefile

@@ -4,7 +4,7 @@ APP_BIN?=app
 default: build
 
 DOCKER_REPO?=gcr.io/uwit-mci-axdd/rttl-r-notebook
-DOCKER_TAG?=d990a62010ae
+DOCKER_TAG?=latest_1-3
 
 build:
 	docker build -t $(DOCKER_REPO):latest -t $(DOCKER_REPO):$(DOCKER_TAG) .

scipy/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=jupyter/scipy-notebook:d990a62010ae
+ARG BASE_CONTAINER=jupyter/scipy-notebook:hub-1.3.0
 FROM $BASE_CONTAINER
 
 LABEL maintainer="UW-IT AXDD <[email protected]>"

scipy/Makefile

@@ -4,11 +4,12 @@ APP_BIN?=app
 default: build
 
 DOCKER_REPO?=gcr.io/uwit-mci-axdd/rttl-scipy-notebook
-DOCKER_TAG?=d990a62010ae
+DOCKER_TAG?=latest_1-3
 
 build:
-	docker build -t $(DOCKER_REPO):latest -t $(DOCKER_REPO):$(DOCKER_TAG) .
+# 	docker build -t $(DOCKER_REPO):latest -t $(DOCKER_REPO):$(DOCKER_TAG) .
+	docker build -t $(DOCKER_REPO):$(DOCKER_TAG) .
 
 push: build
 	docker push $(DOCKER_REPO):$(DOCKER_TAG)
-	docker push $(DOCKER_REPO):latest
+# 	docker push $(DOCKER_REPO):latest

tensorflow/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=jupyter/tensorflow-notebook:d990a62010ae
+ARG BASE_CONTAINER=jupyter/tensorflow-notebook:dfcb043bd887
 FROM $BASE_CONTAINER
 
 LABEL maintainer="UW-IT AXDD <[email protected]>"
@@ -10,33 +10,35 @@ LABEL maintainer="UW-IT AXDD <[email protected]>"
 # bokeh, sqlalchemy, hdf5, vincent, beautifulsoup, protobuf, xlrd, bottleneck,
 # pytables, ipywidgets, ipympl, facets, tensorflow, keras
 
-RUN conda install \
-  emcee \
-  pymc3 \
-  astroML \
-  astropy \
-  astroplan \
-  astroquery \
-  gatspy \
-  pytorch \
-  photutils \
-  #   ccdproc \
-  lmfit \
-  uncertainties \
-  openpyxl \
-  hickle \
-  spacy \
-  textblob \
-  nltk \
-  gensim \
-  requests \
-  lxml \
-  cssselect \
-  plotnine \
-  plotly \
-  selenium \
-  pylogit \
-  choicemodels
+RUN mamba install --quiet --yes \
+    emcee \
+    pymc3 \
+    astroML \
+    astropy \
+    astroplan \
+    astroquery \
+    gatspy \
+    pytorch \
+    lmfit \
+    uncertainties \
+    openpyxl \
+    hickle \
+    spacy \
+    textblob \
+    nltk \
+    gensim \
+    requests \
+    lxml \
+    cssselect \
+    photutils \
+    plotnine \
+    plotly \
+    selenium \
+    pylogit \
+    choicemodels && \
+    mamba clean --all -f -y && \
+    fix-permissions "${CONDA_DIR}" && \
+    fix-permissions "/home/${NB_USER}"
 
 # Install Python 3 packages
 RUN pip install \

tensorflow/Makefile

@@ -4,11 +4,12 @@ APP_BIN?=app
 default: build
 
 DOCKER_REPO?=gcr.io/uwit-mci-axdd/rttl-tensorflow-notebook
-DOCKER_TAG?=d990a62010ae
+DOCKER_TAG?=latest_1-3
 
 build:
-	docker build -t $(DOCKER_REPO):latest -t $(DOCKER_REPO):$(DOCKER_TAG) .
+# 	docker build -t $(DOCKER_REPO):latest -t $(DOCKER_REPO):$(DOCKER_TAG) .
+	docker build -t $(DOCKER_REPO):$(DOCKER_TAG) .
 
 push: build
 	docker push $(DOCKER_REPO):$(DOCKER_TAG)
-	docker push $(DOCKER_REPO):latest
+# 	docker push $(DOCKER_REPO):latest