Skip to content

Commit

Permalink
Merge pull request #1444 from mathbunnyru/asalikhov/more_arm_images
Browse files Browse the repository at this point in the history
r-notebook and scipy-notebook work fine under arm
  • Loading branch information
mathbunnyru committed Aug 25, 2021
2 parents 5acbd48 + 9451ddb commit 6ae9805
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ OWNER?=jupyter
# - linux/arm64
MULTI_IMAGES:= \
base-notebook \
minimal-notebook
minimal-notebook \
r-notebook \
scipy-notebook
# Images that can only be built on the amd64 architecture (aka. x86_64)
AMD64_ONLY_IMAGES:= \
r-notebook \
scipy-notebook \
tensorflow-notebook \
datascience-notebook \
pyspark-notebook \
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ This change is tracked in the issue [#1217](https://github.com/jupyter/docker-st

## CPU Architectures

All published containers support amd64 (x86_64). The base-notebook and
minimal-notebook containers also support arm64. The ambition is to have all
containers support both amd64 and arm64.
All published containers support amd64 (x86_64).
The progress on arm images is tracked in [#1019](https://github.com/jupyter/docker-stacks/issues/1019).
The ambition is to have all containers support both amd64 and arm64.

### Caveats for arm64 images

Expand Down
6 changes: 3 additions & 3 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ Docker destroys the container after notebook server exit, but any files written
CPU Architectures
-----------------

All published containers support amd64 (x86_64). The base-notebook and
minimal-notebook containers also support arm64. The ambition is to have all
containers support both amd64 and arm64.
All published containers support amd64 (x86_64).
The progress on arm images is tracked in `#1019 <https://github.com/jupyter/docker-stacks/issues/1019>`_.
The ambition is to have all containers support both amd64 and arm64.

Caveats for arm64 images
^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down

0 comments on commit 6ae9805

Please sign in to comment.