Move tzdata to minimal-notebook and document it

UBC-DSCI · Mar 25, 2019 · a657b78 · a657b78
1 parent 41e066e
commit a657b78
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 4 deletions.
diff --git a/all-spark-notebook/Dockerfile b/all-spark-notebook/Dockerfile
@@ -15,7 +15,6 @@ RUN fix-permissions $R_LIBS_USER
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     fonts-dejavu \
-    tzdata \
     gfortran \
     gcc && \
     rm -rf /var/lib/apt/lists/*

diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile
@@ -15,7 +15,6 @@ USER root
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     fonts-dejavu \
-    tzdata \
     gfortran \
     gcc && \
     rm -rf /var/lib/apt/lists/*

diff --git a/docs/using/selecting.md b/docs/using/selecting.md
@@ -42,7 +42,7 @@ The Jupyter team maintains a set of Docker image definitions in the [https://git
 
 * Everything in `jupyter/base-notebook`
 * [Pandoc](http://pandoc.org) and [TeX Live](https://www.tug.org/texlive/) for notebook document conversion
-* [git](https://git-scm.com/), [emacs](https://www.gnu.org/software/emacs/), [jed](https://www.jedsoft.org/jed/), [nano](https://www.nano-editor.org/), and unzip
+* [git](https://git-scm.com/), [emacs](https://www.gnu.org/software/emacs/), [jed](https://www.jedsoft.org/jed/), [nano](https://www.nano-editor.org/), tzdata, and unzip
 
 ### jupyter/r-notebook
 

diff --git a/minimal-notebook/Dockerfile b/minimal-notebook/Dockerfile
@@ -27,6 +27,7 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
     texlive-latex-base \
     texlive-latex-extra \
     texlive-xetex \
+    tzdata \
     unzip \
     nano \
     && rm -rf /var/lib/apt/lists/*

diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile
@@ -11,7 +11,6 @@ USER root
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     fonts-dejavu \
-    tzdata \
     unixodbc \
     unixodbc-dev \
     r-cran-rodbc \