From ace42f37d73fded134d765b1c7b07a17d93e5e3b Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Tue, 29 Jun 2021 12:50:35 +0300 Subject: [PATCH 1/2] Remove microbadge usage --- README.md | 1 - all-spark-notebook/README.md | 2 +- base-notebook/README.md | 2 +- datascience-notebook/README.md | 2 +- minimal-notebook/README.md | 2 +- pyspark-notebook/README.md | 2 +- r-notebook/README.md | 2 +- scipy-notebook/README.md | 2 +- tensorflow-notebook/README.md | 2 +- 9 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 023986ef..ac3b42ef 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ [![Read the Docs badge](https://img.shields.io/readthedocs/jupyter-docker-stacks.svg)](https://jupyter-docker-stacks.readthedocs.io/en/latest/ "Documentation build status") [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/jupyter/docker-stacks/master.svg)](https://results.pre-commit.ci/latest/github/jupyter/docker-stacks/master "pre-commit.ci build status") [![Discourse badge](https://img.shields.io/discourse/https/discourse.jupyter.org/users.svg?color=%23f37626)](https://discourse.jupyter.org/ "Jupyter Discourse Forum") -[![DockerHub badge](https://images.microbadger.com/badges/version/jupyter/base-notebook.svg)](https://microbadger.com/images/jupyter/base-notebook "Recent tag/version of jupyter/base-notebook") [![Binder badge](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/jupyter/docker-stacks/master?filepath=README.ipynb "Launch a jupyter/base-notebook container on mybinder.org") Jupyter Docker Stacks are a set of ready-to-run [Docker images](https://hub.docker.com/u/jupyter) diff --git a/all-spark-notebook/README.md b/all-spark-notebook/README.md index bea6f931..957a9590 100644 --- a/all-spark-notebook/README.md +++ b/all-spark-notebook/README.md @@ -2,7 +2,7 @@ [![docker pulls](https://img.shields.io/docker/pulls/jupyter/all-spark-notebook.svg)](https://hub.docker.com/r/jupyter/all-spark-notebook/) [![docker stars](https://img.shields.io/docker/stars/jupyter/all-spark-notebook.svg)](https://hub.docker.com/r/jupyter/all-spark-notebook/) -[![image metadata](https://images.microbadger.com/badges/image/jupyter/all-spark-notebook.svg)](https://microbadger.com/images/jupyter/all-spark-notebook "jupyter/all-spark-notebook image metadata") +[![image size](https://img.shields.io/docker/image-size/jupyter/all-spark-notebook/latest)](https://hub.docker.com/r/jupyter/all-spark-notebook/ "jupyter/all-spark-notebook image size") GitHub Actions in the project builds and pushes this image to Docker Hub. diff --git a/base-notebook/README.md b/base-notebook/README.md index 79c874bd..57f52aa0 100644 --- a/base-notebook/README.md +++ b/base-notebook/README.md @@ -2,7 +2,7 @@ [![docker pulls](https://img.shields.io/docker/pulls/jupyter/base-notebook.svg)](https://hub.docker.com/r/jupyter/base-notebook/) [![docker stars](https://img.shields.io/docker/stars/jupyter/base-notebook.svg)](https://hub.docker.com/r/jupyter/base-notebook/) -[![image metadata](https://images.microbadger.com/badges/image/jupyter/base-notebook.svg)](https://microbadger.com/images/jupyter/base-notebook "jupyter/base-notebook image metadata") +[![image size](https://img.shields.io/docker/image-size/jupyter/base-notebook/latest)](https://hub.docker.com/r/jupyter/base-notebook/ "jupyter/base-notebook image size") GitHub Actions in the project builds and pushes this image to Docker Hub. diff --git a/datascience-notebook/README.md b/datascience-notebook/README.md index b00da716..add541c6 100644 --- a/datascience-notebook/README.md +++ b/datascience-notebook/README.md @@ -2,7 +2,7 @@ [![docker pulls](https://img.shields.io/docker/pulls/jupyter/datascience-notebook.svg)](https://hub.docker.com/r/jupyter/datascience-notebook/) [![docker stars](https://img.shields.io/docker/stars/jupyter/datascience-notebook.svg)](https://hub.docker.com/r/jupyter/datascience-notebook/) -[![image metadata](https://images.microbadger.com/badges/image/jupyter/datascience-notebook.svg)](https://microbadger.com/images/jupyter/datascience-notebook "jupyter/datascience-notebook image metadata") +[![image size](https://img.shields.io/docker/image-size/jupyter/datascience-notebook/latest)](https://hub.docker.com/r/jupyter/datascience-notebook/ "jupyter/datascience-notebook image size") GitHub Actions in the project builds and pushes this image to Docker Hub. diff --git a/minimal-notebook/README.md b/minimal-notebook/README.md index e9d4034a..3c994ece 100644 --- a/minimal-notebook/README.md +++ b/minimal-notebook/README.md @@ -2,7 +2,7 @@ [![docker pulls](https://img.shields.io/docker/pulls/jupyter/minimal-notebook.svg)](https://hub.docker.com/r/jupyter/minimal-notebook/) [![docker stars](https://img.shields.io/docker/stars/jupyter/minimal-notebook.svg)](https://hub.docker.com/r/jupyter/minimal-notebook/) -[![image metadata](https://images.microbadger.com/badges/image/jupyter/minimal-notebook.svg)](https://microbadger.com/images/jupyter/minimal-notebook "jupyter/minimal-notebook image metadata") +[![image size](https://img.shields.io/docker/image-size/jupyter/minimal-notebook/latest)](https://hub.docker.com/r/jupyter/minimal-notebook/ "jupyter/minimal-notebook image size") GitHub Actions in the project builds and pushes this image to Docker Hub. diff --git a/pyspark-notebook/README.md b/pyspark-notebook/README.md index 2f71bc50..50e51a15 100644 --- a/pyspark-notebook/README.md +++ b/pyspark-notebook/README.md @@ -2,7 +2,7 @@ [![docker pulls](https://img.shields.io/docker/pulls/jupyter/pyspark-notebook.svg)](https://hub.docker.com/r/jupyter/pyspark-notebook/) [![docker stars](https://img.shields.io/docker/stars/jupyter/pyspark-notebook.svg)](https://hub.docker.com/r/jupyter/pyspark-notebook/) -[![image metadata](https://images.microbadger.com/badges/image/jupyter/pyspark-notebook.svg)](https://microbadger.com/images/jupyter/pyspark-notebook "jupyter/pyspark-notebook image metadata") +[![image size](https://img.shields.io/docker/image-size/jupyter/pyspark-notebook/latest)](https://hub.docker.com/r/jupyter/pyspark-notebook/ "jupyter/pyspark-notebook image size") GitHub Actions in the project builds and pushes this image to Docker Hub. diff --git a/r-notebook/README.md b/r-notebook/README.md index 1b7d430e..79bb0337 100644 --- a/r-notebook/README.md +++ b/r-notebook/README.md @@ -2,7 +2,7 @@ [![docker pulls](https://img.shields.io/docker/pulls/jupyter/r-notebook.svg)](https://hub.docker.com/r/jupyter/r-notebook/) [![docker stars](https://img.shields.io/docker/stars/jupyter/r-notebook.svg)](https://hub.docker.com/r/jupyter/r-notebook/) -[![image metadata](https://images.microbadger.com/badges/image/jupyter/r-notebook.svg)](https://microbadger.com/images/jupyter/r-notebook "jupyter/r-notebook image metadata") +[![image size](https://img.shields.io/docker/image-size/jupyter/r-notebook/latest)](https://hub.docker.com/r/jupyter/r-notebook/ "jupyter/r-notebook image size") GitHub Actions in the project builds and pushes this image to Docker Hub. diff --git a/scipy-notebook/README.md b/scipy-notebook/README.md index 4ab1250b..e3a1ff2b 100644 --- a/scipy-notebook/README.md +++ b/scipy-notebook/README.md @@ -2,7 +2,7 @@ [![docker pulls](https://img.shields.io/docker/pulls/jupyter/scipy-notebook.svg)](https://hub.docker.com/r/jupyter/scipy-notebook/) [![docker stars](https://img.shields.io/docker/stars/jupyter/scipy-notebook.svg)](https://hub.docker.com/r/jupyter/scipy-notebook/) -[![image metadata](https://images.microbadger.com/badges/image/jupyter/scipy-notebook.svg)](https://microbadger.com/images/jupyter/scipy-notebook "jupyter/scipy-notebook image metadata") +[![image size](https://img.shields.io/docker/image-size/jupyter/scipy-notebook/latest)](https://hub.docker.com/r/jupyter/scipy-notebook/ "jupyter/scipy-notebook image size") GitHub Actions in the project builds and pushes this image to Docker Hub. diff --git a/tensorflow-notebook/README.md b/tensorflow-notebook/README.md index adbd7167..31f43448 100644 --- a/tensorflow-notebook/README.md +++ b/tensorflow-notebook/README.md @@ -2,7 +2,7 @@ [![docker pulls](https://img.shields.io/docker/pulls/jupyter/tensorflow-notebook.svg)](https://hub.docker.com/r/jupyter/tensorflow-notebook/) [![docker stars](https://img.shields.io/docker/stars/jupyter/tensorflow-notebook.svg)](https://hub.docker.com/r/jupyter/tensorflow-notebook/) -[![image metadata](https://images.microbadger.com/badges/image/jupyter/tensorflow-notebook.svg)](https://microbadger.com/images/jupyter/tensorflow-notebook "jupyter/tensorflow-notebook image metadata") +[![image size](https://img.shields.io/docker/image-size/jupyter/tensorflow-notebook/latest)](https://hub.docker.com/r/jupyter/tensorflow-notebook/ "jupyter/tensorflow-notebook image size") GitHub Actions in the project builds and pushes this image to Docker Hub. From 78a72754e156b25cdb308dfd75ce4299088f3569 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Fri, 2 Jul 2021 20:34:38 +0300 Subject: [PATCH 2/2] Update mamba and some packages --- base-notebook/Dockerfile | 6 +++--- scipy-notebook/Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index 6dd06d92..88dc3eb7 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -24,9 +24,9 @@ USER root # (ARGS are in lower case to distinguish them from ENV) # Check https://github.com/conda-forge/miniforge/releases # Conda version -ARG conda_version="4.10.1" +ARG conda_version="4.10.2" # Miniforge installer patch version -ARG miniforge_patch_number="5" +ARG miniforge_patch_number="0" # Miniforge installer architecture ARG miniforge_arch="x86_64" # Package Manager and Python implementation to use (https://github.com/conda-forge/miniforge) @@ -39,7 +39,7 @@ ARG miniforge_version="${conda_version}-${miniforge_patch_number}" # Miniforge installer ARG miniforge_installer="${miniforge_python}-${miniforge_version}-Linux-${miniforge_arch}.sh" # Miniforge checksum -ARG miniforge_checksum="069e151cae85ed4747721e938e7974aa00889a1ae87cff33ddbdde9530fc4c6d" +ARG miniforge_checksum="1e89ee86afa06e23b2478579be16a33fff6cff346314f6a6382fd20b1f83e669" # Install all OS dependencies for notebook server that starts but lacks all # features (e.g., download as all possible file formats) diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index b0c41ffc..c2b769eb 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -25,19 +25,19 @@ RUN conda install --quiet --yes \ 'cython=0.29.*' \ 'dask=2021.6.*' \ 'dill=0.3.*' \ - 'h5py=3.2.*' \ + 'h5py=3.3.*' \ 'ipympl=0.7.*'\ 'ipywidgets=7.6.*' \ 'matplotlib-base=3.4.*' \ 'numba=0.53.*' \ 'numexpr=2.7.*' \ - 'pandas=1.2.*' \ + 'pandas=1.3.*' \ 'patsy=0.5.*' \ 'protobuf=3.17.*' \ 'pytables=3.6.*' \ 'scikit-image=0.18.*' \ 'scikit-learn=0.24.*' \ - 'scipy=1.6.*' \ + 'scipy=1.7.*' \ 'seaborn=0.11.*' \ 'sqlalchemy=1.4.*' \ 'statsmodels=0.12.*' \