Skip to content

Commit 68d2d83

Browse files
authored
Merge pull request #1185 from romainx/update_2020-11-05
Regular update 2020-11-05
2 parents 712576e + 0f2a747 commit 68d2d83

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ALL_IMAGES:=$(ALL_STACKS)
2525

2626
# Dockerfile Linter
2727
HADOLINT="${HOME}/hadolint"
28-
HADOLINT_VERSION="v1.18.0"
28+
HADOLINT_VERSION="v1.18.2"
2929

3030
help:
3131
# http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
@@ -68,7 +68,7 @@ cont-rm-all: ## remove all containers
6868
-docker rm --force $(shell docker ps -a -q) 2> /dev/null
6969

7070
dev/%: ARGS?=
71-
dev/%: DARGS?=
71+
dev/%: DARGS?=-e JUPYTER_ENABLE_LAB=yes
7272
dev/%: PORT?=8888
7373
dev/%: ## run a foreground container for a stack
7474
docker run -it --rm -p $(PORT):8888 $(DARGS) $(OWNER)/$(notdir $@) $(ARGS)

base-notebook/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Ubuntu 20.04 (focal)
55
# https://hub.docker.com/_/ubuntu/?tab=tags&name=focal
66
# OS/ARCH: linux/amd64
7-
ARG ROOT_CONTAINER=ubuntu:focal-20200925@sha256:2e70e9c81838224b5311970dbf7ed16802fbfe19e7a70b3cbfa3d7522aa285b4
7+
ARG ROOT_CONTAINER=ubuntu:focal-20201008@sha256:1d7b639619bdca2d008eca2d5293e3c43ff84cbee597ff76de3b7a7de3e84956
88

99
ARG BASE_CONTAINER=$ROOT_CONTAINER
1010
FROM $BASE_CONTAINER
@@ -129,8 +129,8 @@ RUN conda install --quiet --yes 'tini=0.18.0' && \
129129
# files across image layers when the permissions change
130130
RUN conda install --quiet --yes \
131131
'notebook=6.1.4' \
132-
'jupyterhub=1.1.0' \
133-
'jupyterlab=2.2.8' && \
132+
'jupyterhub=1.2.1' \
133+
'jupyterlab=2.2.9' && \
134134
conda clean --all -f -y && \
135135
npm cache clean --force && \
136136
jupyter notebook --generate-config && \

datascience-notebook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ RUN conda install --quiet --yes \
7070
'r-nycflights13=1.0*' \
7171
'r-randomforest=4.6*' \
7272
'r-rcurl=1.98*' \
73-
'r-rmarkdown=2.4*' \
73+
'r-rmarkdown=2.5*' \
7474
'r-rsqlite=2.2*' \
7575
'r-shiny=1.5*' \
7676
'r-tidyverse=1.3*' \

pyspark-notebook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ USER $NB_UID
5151

5252
# Install pyarrow
5353
RUN conda install --quiet --yes --satisfied-skip-solve \
54-
'pyarrow=1.0.*' && \
54+
'pyarrow=2.0.*' && \
5555
conda clean --all -f -y && \
5656
fix-permissions "${CONDA_DIR}" && \
5757
fix-permissions "/home/${NB_USER}"

r-notebook/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN conda install --quiet --yes \
3737
'r-nycflights13=1.0*' \
3838
'r-randomforest=4.6*' \
3939
'r-rcurl=1.98*' \
40-
'r-rmarkdown=2.4*' \
40+
'r-rmarkdown=2.5*' \
4141
'r-rodbc=1.3*' \
4242
'r-rsqlite=2.2*' \
4343
'r-shiny=1.5*' \

0 commit comments

Comments
 (0)