Skip to content

Commit a01a701

Browse files
authored
Build aarch64 tensorflow image (jupyter#1911)
1 parent 6932c83 commit a01a701

File tree

6 files changed

+67
-72
lines changed

6 files changed

+67
-72
lines changed

.github/workflows/docker-merge-tags.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,10 @@ jobs:
3434
name: ${{ inputs.image }}-x86_64-tags
3535
path: /tmp/tags/
3636
- name: Download aarch64 tags file 📥
37-
if: inputs.image != 'tensorflow-notebook'
3837
uses: actions/download-artifact@v3
3938
with:
4039
name: ${{ inputs.image }}-aarch64-tags
4140
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
4641

4742
# Docker might be stuck when pulling images
4843
# https://github.com/docker/for-mac/issues/2083

.github/workflows/docker.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,15 @@ jobs:
162162
runsOn: ubuntu-latest
163163
needs: [x86_64-minimal]
164164

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+
165174
x86_64-tensorflow:
166175
uses: ./.github/workflows/docker-build-test-upload.yml
167176
with:
@@ -245,6 +254,7 @@ jobs:
245254
minimal-notebook,
246255
scipy-notebook,
247256
r-notebook,
257+
tensorflow-notebook,
248258
datascience-notebook,
249259
pyspark-notebook,
250260
all-spark-notebook,
@@ -256,6 +266,7 @@ jobs:
256266
aarch64-minimal,
257267
aarch64-scipy,
258268
aarch64-r,
269+
aarch64-tensorflow,
259270
aarch64-datascience,
260271
aarch64-pyspark,
261272
aarch64-all-spark,

Makefile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@ ALL_IMAGES:= \
1919
pyspark-notebook \
2020
all-spark-notebook
2121

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-
3222
# Enable BuildKit for Docker build
3323
export DOCKER_BUILDKIT:=1
3424

@@ -50,7 +40,6 @@ build/%: ## build the latest image for a stack using the system's architecture
5040
@echo -n "Built image size: "
5141
@docker images $(OWNER)/$(notdir $@):latest --format "{{.Size}}"
5242
build-all: $(foreach I, $(ALL_IMAGES), build/$(I)) ## build all stacks
53-
build-aarch64: $(foreach I, $(AARCH64_IMAGES), build/$(I)) ## build aarch64 stacks
5443

5544

5645
check-outdated/%: ## check the outdated mamba/conda packages in a stack and produce a report (experimental)

README.md

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

116116
## CPU Architectures
117117

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
119119
- 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
121122

122123
## Using old images
123124

docs/images/inherit.svg

Lines changed: 52 additions & 53 deletions
Loading

docs/using/selecting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ The following diagram depicts the build dependency tree of the core images. (i.e
211211
Any given image inherits the complete content of all ancestor images pointing to it.
212212

213213
[![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)
215215

216216
### Builds
217217

0 commit comments

Comments
 (0)