From 03ec0a592dd6b91aa43d92223884f71751ce35a2 Mon Sep 17 00:00:00 2001
From: romainx <cros.romain@gmail.com>
Date: Thu, 30 Jan 2020 19:01:44 +0100
Subject: [PATCH 1/2] Bump version of R packages

---
 Makefile                        |  9 +++++++++
 all-spark-notebook/Dockerfile   |  8 ++++----
 datascience-notebook/Dockerfile | 24 ++++++++++++------------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index d683bf3f..6c3c1ebc 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,12 @@ n-docs-diff: ## number of docs/ files changed since branch from master
 n-other-diff: ## number of files outside docs/ changed since branch from master
 	@git diff --name-only $(DIFF_RANGE) -- ':!docs/' | wc -l | awk '{print $$1}'
 
+run/%: ## run a bash in interactive mode in a stack
+	docker run -it --rm jupyter/$(notdir $@) /bin/bash
+
+run-sudo/%: ## run a bash in interactive mode as root in a stack
+	docker run -it --rm -u root jupyter/$(notdir $@) /bin/bash
+
 tx-en: ## rebuild en locale strings and push to master (req: GH_TOKEN)
 	@git config --global user.email "travis@travis-ci.org"
 	@git config --global user.name "Travis CI"
@@ -88,3 +94,6 @@ test/%: ## run tests against a stack
 
 test/base-notebook: ## test supported options in the base notebook
 	@TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest test base-notebook/test
+
+up/%: ## launch a stack
+	docker run --rm -p 8888:8888 jupyter/$(notdir $@)
\ No newline at end of file
diff --git a/all-spark-notebook/Dockerfile b/all-spark-notebook/Dockerfile
index d634df72..b0e56d34 100644
--- a/all-spark-notebook/Dockerfile
+++ b/all-spark-notebook/Dockerfile
@@ -23,11 +23,11 @@ USER $NB_UID
 
 # R packages
 RUN conda install --quiet --yes \
-    'r-base=3.6.1' \
+    'r-base=3.6.2' \
     'r-ggplot2=3.2*' \
-    'r-irkernel=1.0*' \
-    'r-rcurl=1.95*' \
-    'r-sparklyr=1.0*' \
+    'r-irkernel=1.1*' \
+    'r-rcurl=1.98*' \
+    'r-sparklyr=1.1*' \
     && \
     conda clean --all -f -y && \
     fix-permissions $CONDA_DIR && \
diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile
index 9f341f5a..f8fadf88 100644
--- a/datascience-notebook/Dockerfile
+++ b/datascience-notebook/Dockerfile
@@ -45,26 +45,26 @@ USER $NB_UID
 
 # R packages including IRKernel which gets installed globally.
 RUN conda install --quiet --yes \
-    'r-base=3.6.1' \
+    'r-base=3.6.2' \
     'r-caret=6.0*' \
     'r-crayon=1.3*' \
-    'r-devtools=2.1*' \
-    'r-forecast=8.7*' \
-    'r-hexbin=1.27*' \
-    'r-htmltools=0.3*' \
-    'r-htmlwidgets=1.3*' \
-    'r-irkernel=1.0*' \
+    'r-devtools=2.2*' \
+    'r-forecast=8.10*' \
+    'r-hexbin=1.28*' \
+    'r-htmltools=0.4*' \
+    'r-htmlwidgets=1.5*' \
+    'r-irkernel=1.1*' \
     'r-nycflights13=1.0*' \
     'r-plyr=1.8*' \
     'r-randomforest=4.6*' \
-    'r-rcurl=1.95*' \
+    'r-rcurl=1.98*' \
     'r-reshape2=1.4*' \
-    'r-rmarkdown=1.14*' \
+    'r-rmarkdown=2.1*' \
     'r-rsqlite=2.1*' \
     'r-shiny=1.3*' \
-    'r-sparklyr=1.0*' \
-    'r-tidyverse=1.2*' \
-    'rpy2=2.9*' \
+    'r-sparklyr=1.1*' \
+    'r-tidyverse=1.3*' \
+    'rpy2=3.1*' \
     && \
     conda clean --all -f -y && \
     fix-permissions $CONDA_DIR && \

From 4c128327f4caa175df7a962a641030d85328e5cf Mon Sep 17 00:00:00 2001
From: romainx <cros.romain@gmail.com>
Date: Fri, 31 Jan 2020 19:40:42 +0100
Subject: [PATCH 2/2] fix duplicate and hardcoded value in makefile

---
 Makefile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 6c3c1ebc..7ee9c4eb 100644
--- a/Makefile
+++ b/Makefile
@@ -69,10 +69,10 @@ n-other-diff: ## number of files outside docs/ changed since branch from master
 	@git diff --name-only $(DIFF_RANGE) -- ':!docs/' | wc -l | awk '{print $$1}'
 
 run/%: ## run a bash in interactive mode in a stack
-	docker run -it --rm jupyter/$(notdir $@) /bin/bash
+	docker run -it --rm $(OWNER)/$(notdir $@) $(SHELL)
 
 run-sudo/%: ## run a bash in interactive mode as root in a stack
-	docker run -it --rm -u root jupyter/$(notdir $@) /bin/bash
+	docker run -it --rm -u root $(OWNER)/$(notdir $@) $(SHELL)
 
 tx-en: ## rebuild en locale strings and push to master (req: GH_TOKEN)
 	@git config --global user.email "travis@travis-ci.org"
@@ -93,7 +93,4 @@ test/%: ## run tests against a stack
 	@TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest test
 
 test/base-notebook: ## test supported options in the base notebook
-	@TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest test base-notebook/test
-
-up/%: ## launch a stack
-	docker run --rm -p 8888:8888 jupyter/$(notdir $@)
\ No newline at end of file
+	@TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest test base-notebook/test
\ No newline at end of file