Skip to content

Commit 6ae9805

Browse files
authored
Merge pull request #1444 from mathbunnyru/asalikhov/more_arm_images
r-notebook and scipy-notebook work fine under arm
2 parents 5acbd48 + 9451ddb commit 6ae9805

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ OWNER?=jupyter
1313
# - linux/arm64
1414
MULTI_IMAGES:= \
1515
base-notebook \
16-
minimal-notebook
16+
minimal-notebook \
17+
r-notebook \
18+
scipy-notebook
1719
# Images that can only be built on the amd64 architecture (aka. x86_64)
1820
AMD64_ONLY_IMAGES:= \
19-
r-notebook \
20-
scipy-notebook \
2121
tensorflow-notebook \
2222
datascience-notebook \
2323
pyspark-notebook \

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ This change is tracked in the issue [#1217](https://github.com/jupyter/docker-st
107107

108108
## CPU Architectures
109109

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

114114
### Caveats for arm64 images
115115

docs/index.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ Docker destroys the container after notebook server exit, but any files written
4747
CPU Architectures
4848
-----------------
4949

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

5454
Caveats for arm64 images
5555
^^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)