Merge pull request #14 from uw-it-aca/pm-RTTL-67_update_z2jh_charts_to_1-1-3

paulkm · web-flow · commit 431fae756a99 · 2021-12-23T12:26:25.000-08:00
Pm rttl 67 update z2jh charts to 1 1 3
diff --git a/datascience/Dockerfile b/datascience/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=jupyter/datascience-notebook:hub-1.3.0
+ARG BASE_CONTAINER=jupyter/datascience-notebook:hub-1.4.2
 
 FROM $BASE_CONTAINER
 
diff --git a/r/Dockerfile b/r/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=jupyter/r-notebook:hub-1.3.0
+ARG BASE_CONTAINER=jupyter/r-notebook:hub-1.4.2
 FROM $BASE_CONTAINER
 
 LABEL maintainer="UW-IT AXDD <aca-it@uw.edu>"
@@ -8,8 +8,7 @@ LABEL maintainer="UW-IT AXDD <aca-it@uw.edu>"
 # tidyverse, devtools, shiny, rmarkdown, forecast, rsqlite, nycflights13,
 # caret, tidymodels, rcurl, randomforest
 
-RUN conda install \
-  r-base=4.0.2 \
+RUN mamba install --quiet --yes \
   emcee \
   pymc3 \
   astroML \
diff --git a/rstudio/Dockerfile b/rstudio/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=jupyter/r-notebook:hub-1.3.0
+ARG BASE_CONTAINER=jupyter/r-notebook:hub-1.4.2
 FROM $BASE_CONTAINER
 
 RUN pip install jupyter-rsession-proxy nbgitpuller
diff --git a/scipy/Dockerfile b/scipy/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=jupyter/scipy-notebook:hub-1.3.0
+ARG BASE_CONTAINER=jupyter/scipy-notebook:hub-1.4.2
 FROM $BASE_CONTAINER
 
 LABEL maintainer="UW-IT AXDD <aca-it@uw.edu>"
diff --git a/tensorflow/Dockerfile b/tensorflow/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=jupyter/tensorflow-notebook:dfcb043bd887
+ARG BASE_CONTAINER=jupyter/tensorflow-notebook:hub-1.4.2
 FROM $BASE_CONTAINER
 
 LABEL maintainer="UW-IT AXDD <aca-it@uw.edu>"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG BASE_CONTAINER=jupyter/datascience-notebook:hub-1.3.0`
	`1`	`+ARG BASE_CONTAINER=jupyter/datascience-notebook:hub-1.4.2`
`2`	`2`
`3`	`3`	`FROM $BASE_CONTAINER`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG BASE_CONTAINER=jupyter/r-notebook:hub-1.3.0`
	`1`	`+ARG BASE_CONTAINER=jupyter/r-notebook:hub-1.4.2`
`2`	`2`	`FROM $BASE_CONTAINER`
`3`	`3`
`4`	`4`	`RUN pip install jupyter-rsession-proxy nbgitpuller`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG BASE_CONTAINER=jupyter/scipy-notebook:hub-1.3.0`
	`1`	`+ARG BASE_CONTAINER=jupyter/scipy-notebook:hub-1.4.2`
`2`	`2`	`FROM $BASE_CONTAINER`
`3`	`3`
`4`	`4`	`LABEL maintainer="UW-IT AXDD <[email protected]>"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG BASE_CONTAINER=jupyter/tensorflow-notebook:dfcb043bd887`
	`1`	`+ARG BASE_CONTAINER=jupyter/tensorflow-notebook:hub-1.4.2`
`2`	`2`	`FROM $BASE_CONTAINER`
`3`	`3`
`4`	`4`	`LABEL maintainer="UW-IT AXDD <[email protected]>"`