File tree Expand file tree Collapse file tree 6 files changed +67
-72
lines changed Expand file tree Collapse file tree 6 files changed +67
-72
lines changed Original file line number Diff line number Diff line change @@ -34,15 +34,10 @@ jobs:
34
34
name : ${{ inputs.image }}-x86_64-tags
35
35
path : /tmp/tags/
36
36
- name : Download aarch64 tags file 📥
37
- if : inputs.image != 'tensorflow-notebook'
38
37
uses : actions/download-artifact@v3
39
38
with :
40
39
name : ${{ inputs.image }}-aarch64-tags
41
40
path : /tmp/tags/
42
- - name : Create an empty aarch64 tags file for tensorflow-notebook 💩
43
- if : inputs.image == 'tensorflow-notebook'
44
- run : touch /tmp/tags/aarch64-tensorflow-notebook.txt
45
- shell : bash
46
41
47
42
# Docker might be stuck when pulling images
48
43
# https://github.com/docker/for-mac/issues/2083
Original file line number Diff line number Diff line change @@ -162,6 +162,15 @@ jobs:
162
162
runsOn : ubuntu-latest
163
163
needs : [x86_64-minimal]
164
164
165
+ aarch64-tensorflow :
166
+ uses : ./.github/workflows/docker-build-test-upload.yml
167
+ with :
168
+ parentImage : scipy-notebook
169
+ image : tensorflow-notebook
170
+ platform : aarch64
171
+ runsOn : ARM64
172
+ needs : [aarch64-scipy]
173
+
165
174
x86_64-tensorflow :
166
175
uses : ./.github/workflows/docker-build-test-upload.yml
167
176
with :
@@ -245,6 +254,7 @@ jobs:
245
254
minimal-notebook,
246
255
scipy-notebook,
247
256
r-notebook,
257
+ tensorflow-notebook,
248
258
datascience-notebook,
249
259
pyspark-notebook,
250
260
all-spark-notebook,
@@ -256,6 +266,7 @@ jobs:
256
266
aarch64-minimal,
257
267
aarch64-scipy,
258
268
aarch64-r,
269
+ aarch64-tensorflow,
259
270
aarch64-datascience,
260
271
aarch64-pyspark,
261
272
aarch64-all-spark,
Original file line number Diff line number Diff line change @@ -19,16 +19,6 @@ ALL_IMAGES:= \
19
19
pyspark-notebook \
20
20
all-spark-notebook
21
21
22
- AARCH64_IMAGES: = \
23
- docker-stacks-foundation \
24
- base-notebook \
25
- minimal-notebook \
26
- r-notebook \
27
- scipy-notebook \
28
- datascience-notebook \
29
- pyspark-notebook \
30
- all-spark-notebook
31
-
32
22
# Enable BuildKit for Docker build
33
23
export DOCKER_BUILDKIT: =1
34
24
@@ -50,7 +40,6 @@ build/%: ## build the latest image for a stack using the system's architecture
50
40
@echo -n " Built image size: "
51
41
@docker images $(OWNER ) /$(notdir $@ ) :latest --format " {{.Size}}"
52
42
build-all : $(foreach I, $(ALL_IMAGES ) , build/$(I ) ) # # build all stacks
53
- build-aarch64 : $(foreach I, $(AARCH64_IMAGES ) , build/$(I ) ) # # build aarch64 stacks
54
43
55
44
56
45
check-outdated/% : # # check the outdated mamba/conda packages in a stack and produce a report (experimental)
Original file line number Diff line number Diff line change @@ -115,9 +115,10 @@ This change is tracked in the issue [#1217](https://github.com/jupyter/docker-st
115
115
116
116
## CPU Architectures
117
117
118
- - We publish containers for both ` x86_64 ` and ` aarch64 ` platforms, except for ` tensorflow-notebook ` , which only supports ` x86_64 ` for now
118
+ - We publish containers for both ` x86_64 ` and ` aarch64 ` platforms
119
119
- Single-platform images have either ` aarch64 ` or ` x86_64 ` tag prefixes, for example, ` jupyter/base-notebook:aarch64-python-3.10.5 `
120
- - Starting from ` 2022-09-21 ` , we create multi-platform images
120
+ - Starting from ` 2022-09-21 ` , we create multi-platform images (except ` tensorflow-notebook ` )
121
+ - Starting from ` 2023-06-01 ` , we create multi-platform ` tensorflow-notebook ` image as well
121
122
122
123
## Using old images
123
124
Original file line number Diff line number Diff line change @@ -211,7 +211,7 @@ The following diagram depicts the build dependency tree of the core images. (i.e
211
211
Any given image inherits the complete content of all ancestor images pointing to it.
212
212
213
213
[ ![ Image inheritance
214
- diagram] ( ../images/inherit.svg )] ( http://interactive.blockdiag.com/?compression=deflate&src=eJyFj0FqxDAMRfc5hchqsvCuDFNCe4Lu2mVhUBKlNXGkYMtkMqV3r70pOLRk-_T-56tz0k-DxQ_4qgAGGjE6vY7CGuyd4Ake2yod6thF1vjOp5e3V1itfsIilhU8OcJATQ3mGYbURd4ExX4KZpTIA6oVbnP1P7ec61KDYVHqRKYsFyAbs2U7oyukPcte6O2yFVZJslMrcRA_Oll_eXpM2G1wu5yv54em_juZFmOixD0dLvEHK5YtLOinwtqz7KFzZm9-_wDZDphP )
214
+ diagram] ( ../images/inherit.svg )] ( http://interactive.blockdiag.com/?compression=deflate&src=eJyFjjFuwzAMRXefgvDUDDpAYaQnyNaOBQraphPCCmlIFIy0yN0rdQggI4XX9x__Z-91mEfGM_w0ACNNmLx9TSoW-ZvgCK9d5hqYxNBYJaNFgwVk65octalPYulTXk4f77CyXXLOYhDIE0Y6tODeYMwrFFw0HOboJk0y_rWV8v-yctfnBidq1KvORa5AMa4sfEVfSVtWvDjwcqusmhSnNZKoYfK6Pnj7XM0vYqYkA-1Oh53Z5RYXDHNlbVnx0Hu3Ne-_7MWcxg )
215
215
216
216
### Builds
217
217
You can’t perform that action at this time.
0 commit comments