Build aarch64 tensorflow image (#1911)

jupyter · Jun 1, 2023 · a01a701 · a01a701
1 parent 6932c83
commit a01a701
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 72 deletions.
diff --git a/.github/workflows/docker-merge-tags.yml b/.github/workflows/docker-merge-tags.yml
@@ -34,15 +34,10 @@ jobs:
           name: ${{ inputs.image }}-x86_64-tags
           path: /tmp/tags/
       - name: Download aarch64 tags file 📥
-        if: inputs.image != 'tensorflow-notebook'
         uses: actions/download-artifact@v3
         with:
           name: ${{ inputs.image }}-aarch64-tags
           path: /tmp/tags/
-      - name: Create an empty aarch64 tags file for tensorflow-notebook 💩
-        if: inputs.image == 'tensorflow-notebook'
-        run: touch /tmp/tags/aarch64-tensorflow-notebook.txt
-        shell: bash
 
       # Docker might be stuck when pulling images
       # https://github.com/docker/for-mac/issues/2083

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -162,6 +162,15 @@ jobs:
       runsOn: ubuntu-latest
     needs: [x86_64-minimal]
 
+  aarch64-tensorflow:
+    uses: ./.github/workflows/docker-build-test-upload.yml
+    with:
+      parentImage: scipy-notebook
+      image: tensorflow-notebook
+      platform: aarch64
+      runsOn: ARM64
+    needs: [aarch64-scipy]
+
   x86_64-tensorflow:
     uses: ./.github/workflows/docker-build-test-upload.yml
     with:
@@ -245,6 +254,7 @@ jobs:
             minimal-notebook,
             scipy-notebook,
             r-notebook,
+            tensorflow-notebook,
             datascience-notebook,
             pyspark-notebook,
             all-spark-notebook,
@@ -256,6 +266,7 @@ jobs:
         aarch64-minimal,
         aarch64-scipy,
         aarch64-r,
+        aarch64-tensorflow,
         aarch64-datascience,
         aarch64-pyspark,
         aarch64-all-spark,

diff --git a/Makefile b/Makefile
@@ -19,16 +19,6 @@ ALL_IMAGES:= \
 	pyspark-notebook \
 	all-spark-notebook
 
-AARCH64_IMAGES:= \
-	docker-stacks-foundation \
-	base-notebook \
-	minimal-notebook \
-	r-notebook \
-	scipy-notebook \
-	datascience-notebook \
-	pyspark-notebook \
-	all-spark-notebook
-
 # Enable BuildKit for Docker build
 export DOCKER_BUILDKIT:=1
 
@@ -50,7 +40,6 @@ build/%: ## build the latest image for a stack using the system's architecture
 	@echo -n "Built image size: "
 	@docker images $(OWNER)/$(notdir $@):latest --format "{{.Size}}"
 build-all: $(foreach I, $(ALL_IMAGES), build/$(I)) ## build all stacks
-build-aarch64: $(foreach I, $(AARCH64_IMAGES), build/$(I)) ## build aarch64 stacks
 
 
 check-outdated/%: ## check the outdated mamba/conda packages in a stack and produce a report (experimental)

diff --git a/README.md b/README.md
@@ -115,9 +115,10 @@ This change is tracked in the issue [#1217](https://github.com/jupyter/docker-st
 
 ## CPU Architectures
 
-- We publish containers for both `x86_64` and `aarch64` platforms, except for `tensorflow-notebook`, which only supports `x86_64` for now
+- We publish containers for both `x86_64` and `aarch64` platforms
 - Single-platform images have either `aarch64` or `x86_64` tag prefixes, for example, `jupyter/base-notebook:aarch64-python-3.10.5`
-- Starting from `2022-09-21`, we create multi-platform images
+- Starting from `2022-09-21`, we create multi-platform images (except `tensorflow-notebook`)
+- Starting from `2023-06-01`, we create multi-platform `tensorflow-notebook` image as well
 
 ## Using old images
 

diff --git a/docs/images/inherit.svg b/docs/images/inherit.svg
diff --git a/docs/using/selecting.md b/docs/using/selecting.md
@@ -211,7 +211,7 @@ The following diagram depicts the build dependency tree of the core images. (i.e
 Any given image inherits the complete content of all ancestor images pointing to it.
 
 [![Image inheritance
-diagram](../images/inherit.svg)](http://interactive.blockdiag.com/?compression=deflate&src=eJyFj0FqxDAMRfc5hchqsvCuDFNCe4Lu2mVhUBKlNXGkYMtkMqV3r70pOLRk-_T-56tz0k-DxQ_4qgAGGjE6vY7CGuyd4Ake2yod6thF1vjOp5e3V1itfsIilhU8OcJATQ3mGYbURd4ExX4KZpTIA6oVbnP1P7ec61KDYVHqRKYsFyAbs2U7oyukPcte6O2yFVZJslMrcRA_Oll_eXpM2G1wu5yv54em_juZFmOixD0dLvEHK5YtLOinwtqz7KFzZm9-_wDZDphP)
+diagram](../images/inherit.svg)](http://interactive.blockdiag.com/?compression=deflate&src=eJyFjjFuwzAMRXefgvDUDDpAYaQnyNaOBQraphPCCmlIFIy0yN0rdQggI4XX9x__Z-91mEfGM_w0ACNNmLx9TSoW-ZvgCK9d5hqYxNBYJaNFgwVk65octalPYulTXk4f77CyXXLOYhDIE0Y6tODeYMwrFFw0HOboJk0y_rWV8v-yctfnBidq1KvORa5AMa4sfEVfSVtWvDjwcqusmhSnNZKoYfK6Pnj7XM0vYqYkA-1Oh53Z5RYXDHNlbVnx0Hu3Ne-_7MWcxg)
 
 ### Builds