hazza/docker-stacks
1
0
Fork 0
mirror of https://github.com/jupyter/docker-stacks.git synced 2025-10-18 15:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into asalikhov/python_tagging

Browse Source
This commit is contained in:
Ayaz Salikhov
2021-05-03 01:05:52 +03:00
parent e237c24335 bbf0ada0a9
commit 73a27a4bbd
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
datascience-notebook/Dockerfile
View File

@@ -5,10 +5,6 @@ FROM $BASE_CONTAINER
LABEL maintainer="Jupyter Project <jupyter@googlegroups.com>" LABEL maintainer="Jupyter Project <jupyter@googlegroups.com>"
# Set when building on Travis so that certain long-running build steps can
# be skipped to shorten build time.
ARG TEST_ONLY_BUILD
# Fix DL4006 # Fix DL4006
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -79,16 +75,13 @@ RUN conda install --quiet --yes \
fix-permissions "${CONDA_DIR}" && \ fix-permissions "${CONDA_DIR}" && \
fix-permissions "/home/${NB_USER}" fix-permissions "/home/${NB_USER}"
# Add Julia packages. Only add HDF5 if this is not a test-only build since # Add Julia packages.
# it takes roughly half the entire build time of all of the images on Travis
# to add this one package and often causes Travis to timeout.
#
# Install IJulia as jovyan and then move the kernelspec out # Install IJulia as jovyan and then move the kernelspec out
# to the system share location. Avoids problems with runtime UID change not # to the system share location. Avoids problems with runtime UID change not
# taking effect properly on the .local folder in the jovyan home dir. # taking effect properly on the .local folder in the jovyan home dir.
RUN julia -e 'import Pkg; Pkg.update()' && \ RUN julia -e 'import Pkg; Pkg.update()' && \
(test $TEST_ONLY_BUILD || julia -e 'import Pkg; Pkg.add("HDF5")') && \ julia -e 'import Pkg; Pkg.add("HDF5")' && \
julia -e "using Pkg; pkg\"add IJulia\"; pkg\"precompile\"" && \ julia -e 'using Pkg; pkg"add IJulia"; pkg"precompile"' && \
# move kernelspec out of home \ # move kernelspec out of home \
mv "${HOME}/.local/share/jupyter/kernels/julia"* "${CONDA_DIR}/share/jupyter/kernels/" && \ mv "${HOME}/.local/share/jupyter/kernels/julia"* "${CONDA_DIR}/share/jupyter/kernels/" && \
chmod -R go+rx "${CONDA_DIR}/share/jupyter" && \ chmod -R go+rx "${CONDA_DIR}/share/jupyter" && \

2
docs/contributing/lint.md
View File

@@ -1,7 +1,7 @@
# Lint # Lint
In order to enforce some rules **linters** are used in this project. In order to enforce some rules **linters** are used in this project.
Linters can be run either during the **development phase** (by the developer) and during **integration phase** (by Travis). Linters can be run either during the **development phase** (by the developer) and during **integration phase** (by GitHub Actions).
To integrate and enforce this process in the project lifecycle we are using **git hooks** through [pre-commit][pre-commit]. To integrate and enforce this process in the project lifecycle we are using **git hooks** through [pre-commit][pre-commit].
## Pre-commit hook ## Pre-commit hook

6
tensorflow-notebook/Dockerfile
View File

@@ -6,7 +6,9 @@ FROM $BASE_CONTAINER
LABEL maintainer="Jupyter Project <jupyter@googlegroups.com>" LABEL maintainer="Jupyter Project <jupyter@googlegroups.com>"
# Install Tensorflow # Install Tensorflow
RUN pip install --quiet --no-cache-dir \ RUN mamba install --quiet --yes \
'tensorflow==2.4.1' && \ 'tensorflow=2.4.1' \
&& \
conda clean --all -f -y && \
fix-permissions "${CONDA_DIR}" && \ fix-permissions "${CONDA_DIR}" && \
fix-permissions "/home/${NB_USER}" fix-permissions "/home/${NB_USER}"