Commit Graph

608 Commits

Author SHA1 Message Date
Ayaz Salikhov
5800b8275c Pin nodejs version (#1906) 2023-05-26 15:01:54 +04:00
Kenta Murata
e98be3d3d0 Install nodejs >= 18.0 (#1902)
* Install nodejs >= 18.0

NodeJS >= 18.0 requires `jupyter lab build` command.

Fixes #1901.

* Update Dockerfile

* Update Dockerfile

* Update test_packages.py

---------

Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
2023-05-26 11:29:13 +04:00
Ayaz Salikhov
8dbeaa5401 Remove --quiet flag when not needed (#1887) 2023-03-09 15:52:20 +04:00
René Schmit
f16d1e3a93 Update docker_healthcheck.py (#1882)
* Update docker_healthcheck.py

This does not (always) work. Sometimes, other JSON files appear in the directory, like this kernel-xxx file

jpserver-6.json
jpserver-6-open.html
kernel-374f4977-29fc-43e0-8a48-231f6980fdab.json

changing the glob expression to something like "jpserver*.json" instead of simply "*.json" should solve the problem (at least in my case, I checked with a quick patch on a live container, the healthcheck immediately turned 'healthy' again...)

* Update base-notebook/docker_healthcheck.py

* Update docker_healthcheck.py

---------

Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
2023-03-03 23:40:53 +04:00
Ayaz Salikhov
e407f93c8d Remove extra space 2023-02-28 16:12:34 +04:00
Ayaz Salikhov
0074a09c87 Improve docker_healthcheck.py file 2023-02-28 14:23:05 +04:00
Muhammad Aji Muharrom
bcd323f794 Healthcheck url from json (#1868)
* Get healthcheck URL from JSON file

Obtain Jupyter server's full URL from
/home/$NB_USER/.local/share/jupyter/runtime/*.json
and use it for healthcheck.

* Expand tests for healthcheck

* Update pre-commit config

* Remove workdir from tests

* Wait for container start with 0.1s interval

* Quote NB_USER variable on base-notebook/Dockerfile

* Fix style and make test actually work

* Ooops, GitHub didn't show last line

* Fix mypy

* Use bash with pipefail option for healthcheck

* Create python script for healthcheck

* Don't verify SSL certificate on healthcheck

* Update healthcheck test

- Add "user" parameter
- Add tests when container should not be healthy

* Fix typo

* Update test_healthcheck.py

---------

Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
2023-02-28 14:07:52 +04:00
Muhammad Aji Muharrom
0d324bc0b3 Parameterize healthcheck by internal port (#1859)
* Use the JUPYTER_PORT environment variable to configure server port

- Remove port setting in jupyter_server_config.py
- Declare the $JUPYTER_PORT env on the base Dockerfile
- Use it for HEALTHCHECK

* Add test case for JUPYTER_PORT env variable

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update documentation

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update style

* Better wording

* Better wording

* Add test for custom internal port

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Parametrize internal port test case

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Try to fix test

* Better tests

Co-authored-by: Muhammad Aji Muharrom <ajimuharrom@uchicago.edu>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
Co-authored-by: Ayaz Salikhov <mathbunnyru@gmail.com>
2023-01-24 11:19:39 +04:00
Ayaz Salikhov
2a1cd45ebf Pin jupyter_server>=2.0.0 (#1853)
* Pin jupyter_server==2.0.0

* Update scipy-notebook/Dockerfile

Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>

* Fix test

* Fix test

* Test healthcheck properly

* Fix typing

Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2022-12-30 11:08:27 +02:00
Kevin Bates
10e52ee843 Create base image to base-notebook for non-server Jupyter applications (#1825)
* Create base-jupyter from base-notebook for non-server jupyter applications

* Fix pre-commit errors and begin test refactoring

* More test refactoring

* Add base-jupyter to images_hierarchy

* Use folder work instead of .jupyter in nb-user test

* Add base-jupyter to tagging hierarchy

* Linting: trailing comma

* Apply review comments, remove obsolute Miniforge reference

* Add self-signed cert comment back to base-notebook doc

* Update docs/using/selecting.md

Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>

* Remove redundant apt-get upgrade per review

* Remove b/c approaches per review

* Move test_nb_user_change back to base-notebook tests, per review

* fix linting

* Rename base-jupyter to docker-stacks-foundation, per review

* Rename tests/base-jupyter to docker-stacks-foundation

* Use alphabetical order

* Use alphabetical order

* Fix markdown style

* Split test_nb_user_change between the foundation and base tests

Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
2022-11-13 01:44:44 +04:00
Ayaz Salikhov
61fe0e3abe Build images with ubuntu-22.04 and python-3.10 2022-10-10 01:36:30 +04:00
Ayaz Salikhov
ed2908bbb6 Build images with ubuntu-22.04 and python-3.9 2022-10-09 23:08:01 +04:00
Ayaz Salikhov
7285848c0a Build images with ubuntu-22.04 and python-3.8 2022-10-09 23:04:42 +04:00
Ayaz Salikhov
b86753318a Build images with ubuntu-22.04 and python-3.7 2022-10-09 17:14:52 +04:00
Ayaz Salikhov
f3079808ca Build images with ubuntu-20.04 and python-3.10 2022-10-09 15:38:45 +04:00
Ayaz Salikhov
5ae537728c Build images with ubuntu-20.04 and python-3.9 2022-10-09 14:21:30 +04:00
Ayaz Salikhov
a374cab4fc Build images with ubuntu-20.04 and python-3.8 2022-10-09 14:17:20 +04:00
Ayaz Salikhov
1aac87eb7f Build images with ubuntu-20.04 and python-3.7 (#1793) 2022-10-09 12:45:03 +04:00
Ayaz Salikhov
25289334f2 Fix docker hub link 2022-09-29 17:55:11 +04:00
Ayaz Salikhov
a85bfad8ca Merge tags and create multi-platform images (#1789)
* Merge tags and create multi-platform images

* Add new files :)

* Provide images

* Fix

* Fix

* Use the same naming style as python for the images

* Fix docker image rmi command

* Use plumbum.FG

* Fix

* Add missing path

* Few merging fixes

* Add pushing manifests

* Add missing path

* Add arch to apply tags

* Use platform word

* Remove unused step

* Merge tags for tensorflow as well

* Do not use print

* Make merge_tags work when image doesn't exist

* Add logs

* Add icon

* Add tensorflow-notebook workaround

* Unify platform usage

* Remove unused function

* Fix

* Update docs
2022-09-21 09:58:57 +04:00
Peteris Rudzusiks
83a5335f71 Improve performance of fix-permissions script (#1776) 2022-08-24 00:03:24 +04:00
Darek
0fd68f0e6a Remove inkscape package from the minimal-notebook (#1765)
* Removing inkscape

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Adding Rprofile to add plot_mimetypes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update datascience-notebook/Dockerfile

Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>

* Update datascience-notebook/Rprofile.site

Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>

* Adding R notebook tests

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Moving Rprofile.site to minimal;
Removing duplicate R test code

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fixing flake8 errors

* Update minimal-notebook/Dockerfile

Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>

* Update minimal-notebook/Rprofile.site

Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>

* Removing empty line

* Renaming minetypes to  mimetypes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Renaming test module to avoid mypy error

* Adding to jupyter.plot_mimetypes

* Update R_mimetype_check.py

* Update test_mimetypes.py

* Update test_R_mimetypes.py

* Update test_R_mimetypes.py

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
2022-08-20 10:17:03 +04:00
Ayaz Salikhov
e050d8c567 Use 22.04 tag to make the code easier to understand 2022-07-09 16:59:40 +04:00
Ayaz Salikhov
6da462d1d9 Merge branch 'master' into asalikhov/ubuntu_jammy 2022-07-05 21:57:59 +04:00
Ayaz Salikhov
7c4f3bd4a0 Remove unit_check_file 2022-07-05 13:39:18 +04:00
Ayaz Salikhov
44d3104b42 Remove export G_SLICE=always-malloc 2022-07-04 23:38:36 +04:00
Ayaz Salikhov
911b4c1a07 Merge branch 'master' into asalikhov/new_build_system 2022-05-31 22:04:05 +04:00
Ben Mares
46c41283ba Bump Python 3.9 → 3.10 2022-05-26 15:30:14 +02:00
Ayaz Salikhov
6c5a48ef7c Merge branch 'master' into asalikhov/ubuntu_jammy 2022-05-13 18:30:10 +03:00
Ayaz Salikhov
26951efe86 Merge branch 'master' into asalikhov/new_build_system 2022-05-13 18:29:47 +03:00
Ayaz Salikhov
c1067a67af Fix HEALTHCHECK when GEN_CERT=yes 2022-05-13 17:31:33 +03:00
Ayaz Salikhov
cfb7fd6ca1 [TMP] Add test to check if image is freshly built 2022-05-13 02:59:40 +03:00
Ben Mares
476829f0f4 Proposed improvements for G_SLICE (#1697)
* Try to fix mamba under aarch64 QEMU by setting ENV G_SLICE=always-malloc

* Set G_SLICE inside if statement

* Write "extract_threads: 1" to /opt/.condarc

Co-authored-by: Ayaz Salikhov <mathbunnyru@gmail.com>
2022-05-03 16:51:38 +03:00
Ayaz Salikhov
d11cb67ace Switch to ubuntu:jammy 2022-05-01 20:03:58 +03:00
Ayaz Salikhov
a8579ea332 Fix choosing python version 2022-04-30 20:43:47 +03:00
Ayaz Salikhov
f6704028bc Remove mamba and micromamba explicit versions 2022-04-30 20:41:20 +03:00
Ayaz Salikhov
0b66a72087 Keep apt list sorted 2022-04-30 20:25:21 +03:00
Ben Mares
adcc2e6991 Merge remote-tracking branch 'upstream/master' into micromamba 2022-04-29 20:20:10 +02:00
Ben Mares
88fdffe4e6 Workaround for hanging via extract_threads=1 2022-04-29 20:11:13 +02:00
yacchin1205
f881565675 Fix healthcheck for JupyterHub 2022-04-22 02:10:24 +00:00
Ben Mares
0b77294758 Set lock_timeout=300 2022-04-06 11:03:54 +02:00
Ben Mares
2d22fe1642 Try 1=download_threads=extract_threads 2022-04-05 22:42:56 +02:00
Ben Mares
d10583c564 Slightly reduce micromamba verbosity 2022-04-04 19:44:46 +02:00
Ben Mares
3f67c20598 Enable verbose mode on mamba install 2022-04-04 12:24:18 +02:00
Ben Mares
bfd803941b Allow pinning of MAMBA_VERSION 2022-04-03 16:41:07 +02:00
Ben Mares
12496f7f54 Merge branch 'master' into micromamba 2022-04-03 16:32:22 +02:00
Ben Mares
27040a5d0a Pin Python to 3.9 2022-04-01 20:55:59 +02:00
Ayaz Salikhov
796ea4bf68 Update base-notebook/Dockerfile 2022-04-01 12:30:21 +01:00
Ben Mares
1922be6ef8 Remove the hacks 2022-04-01 09:47:00 +02:00
Ayaz Salikhov
c1a892c6dc Remove JUPYTER_ENABLE_LAB variable warning 2022-04-01 00:23:17 +01:00