Merge branch 'experimental' into test_jupyterlab2

Author: pgleeson

.github/workflows/docker-image.yml

@@ -2,9 +2,9 @@ name: Docker Image Build & Run
 
 on:
   push:
-    branches: [ master, dev*, test* ]
+    branches: [ master, dev*, experimental, test* ]
   pull_request:
-    branches: [ master, dev*, test* ]
+    branches: [ master, dev*, experimental, test* ]
 
 jobs:
 

build.sh

@@ -1,4 +1,14 @@
 #!/bin/bash
 
-version=$(<VERSION) # Read version of Dockerfile from file VERSION
-docker build "$@" -t "openworm/openworm:$version" .
+version=$(<VERSION)
+
+# Set the platform flag if we're on ARM
+arch=$(uname -m)
+if [[ "$arch" == "arm64" || "$arch" == "aarch64" ]]; then
+    platform_flag="--platform linux/amd64"
+else
+    platform_flag=""
+fi
+
+# Build the Docker image
+docker build $platform_flag "$@" -t "openworm/openworm:$version" .