Force docker container to be x86_64 for docker builds

.gitignore

@@ -2,3 +2,4 @@ bazel-*
 out/
 dist/
 .DS_Store
+MODULE.*

Makefile

@@ -176,7 +176,7 @@ su $(shell id -u -n) $(if $(1),-c '$(1)',)
 endef
 
 docker-image:
-	docker build $(DOCKER_IMAGE_OPTIONS) -t $(DOCKER_TAG) \
+	docker build --platform linux/amd64 $(DOCKER_IMAGE_OPTIONS) -t $(DOCKER_TAG) \
 	    --build-arg IMAGE=$(DOCKER_IMAGE) $(DOCKER_CONTEXT_DIR)
 
 docker-shell: docker-image

docker/Dockerfile

@@ -22,36 +22,36 @@ RUN dpkg --add-architecture arm64
 
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      libc6-dev:arm64 \
-      libc6-dev:armhf \
+    libc6-dev:arm64 \
+    libc6-dev:armhf \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      python3-all \
-      python3-numpy \
-      build-essential \
-      crossbuild-essential-armhf \
-      crossbuild-essential-arm64 \
-      libusb-1.0-0-dev \
-      libusb-1.0-0-dev:arm64 \
-      libusb-1.0-0-dev:armhf \
-      zlib1g-dev \
-      zlib1g-dev:armhf \
-      zlib1g-dev:arm64 \
-      sudo \
-      debhelper \
-      pkg-config \
-      zip \
-      unzip \
-      curl \
-      wget \
-      git \
-      tree \
-      software-properties-common \
-      $(grep Ubuntu /etc/os-release > /dev/null && echo vim-common || echo xxd)
+    python3-all \
+    python3-numpy \
+    build-essential \
+    crossbuild-essential-armhf \
+    crossbuild-essential-arm64 \
+    libusb-1.0-0-dev \
+    libusb-1.0-0-dev:arm64 \
+    libusb-1.0-0-dev:armhf \
+    zlib1g-dev \
+    zlib1g-dev:armhf \
+    zlib1g-dev:arm64 \
+    sudo \
+    debhelper \
+    pkg-config \
+    zip \
+    unzip \
+    curl \
+    wget \
+    git \
+    tree \
+    software-properties-common \
+    $(grep Ubuntu /etc/os-release > /dev/null && echo vim-common || echo xxd)
 
 # Bionic Beaver == Ubuntu 18.04
 RUN if grep 'Bionic Beaver' /etc/os-release > /dev/null; then \
-      add-apt-repository ppa:ubuntu-toolchain-r/test \
-        && DEBIAN_FRONTEND=noninteractive apt-get install -y gcc-9 g++-9; \
+    add-apt-repository ppa:ubuntu-toolchain-r/test \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y gcc-9 g++-9; \
     fi
 
 ARG BAZEL_VERSION=6.5.0

workspace.bzl

@@ -45,10 +45,14 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 #TENSORFLOW_COMMIT = "6887368d6d46223f460358323c4b76d61d1558a8"
 #TENSORFLOW_SHA256 = "bb25fa4574e42ea4d452979e1d2ba3b86b39569d6b8106a846a238b880d73652"
 
-# TF release 2.16.1 as of 03/07/2024. Current.
+# TF release 2.16.1 as of 03/07/2024. Current in base repo
 TENSORFLOW_COMMIT = "5bc9d26649cca274750ad3625bd93422617eed4b"
 TENSORFLOW_SHA256 = "fe592915c85d1a89c20f3dd89db0772ee22a0fbda78e39aa46a778d638a96abc"
 
+# TF release 2.17.1 as of 10/15/2024. Current working
+#TENSORFLOW_COMMIT = "3c92ac03cab816044f7b18a86eb86aa01a294d95"
+#TENSORFLOW_SHA256 = "317dd95c4830a408b14f3e802698eb68d70d81c7c7cfcd3d28b0ba023fe84a68"
+
 #CORAL_CROSSTOOL_COMMIT = "6bcc2261d9fc60dff386b557428d98917f0af491"
 #CORAL_CROSSTOOL_SHA256 = "38cb4da13009d07ebc2fed4a9d055b0f914191b344dd2d1ca5803096343958b4"