AI: Use Docker build argument to specify TensorFlow version #222 #4922

This also ensures that the archives will be created in /build.

Signed-off-by: Michael Mayer <michael@photoprism.app>

Makefile

@@ -28,6 +28,7 @@ BUILD_TAG ?= $(BUILD_DATE)-$(BUILD_VERSION)
 BUILD_OS ?= $(shell uname -s)
 BUILD_ARCH ?= $(shell scripts/dist/arch.sh)
 JS_BUILD_PATH ?= $(shell realpath "./assets/static/build")
+TF_VERSION ?= 2.18.0
 
 # Install parameters.
 INSTALL_PATH ?= $(BUILD_PATH)/photoprism-ce_$(BUILD_TAG)-$(shell echo $(BUILD_OS) | tr '[:upper:]' '[:lower:]')-$(BUILD_ARCH)
@@ -297,14 +298,20 @@ build-libheif-arm64-latest:
 build-libheif-armv7-latest:
 	docker run --rm -u $(UID) --platform=arm --pull=always -v ".:/go/src/github.com/photoprism/photoprism" -e BUILD_ARCH=arm -e SYSTEM_ARCH=arm photoprism/develop:armv7 ./scripts/dist/build-libheif.sh
 	docker run --rm -u $(UID) --platform=arm --pull=always -v ".:/go/src/github.com/photoprism/photoprism" -e BUILD_ARCH=arm -e SYSTEM_ARCH=arm photoprism/develop:jammy ./scripts/dist/build-libheif.sh
-build-tensorflow:
-	docker build -t photoprism/tensorflow:build docker/tensorflow
-terminal-tensorflow:
-	docker run --rm -ti --platform=amd64 -v "./build:/build" -e BUILD_ARCH=amd64 -e SYSTEM_ARCH=amd64 photoprism/tensorflow:build bash
-build-tensorflow-arm64:
-	docker build -t photoprism/tensorflow:arm64 docker/tensorflow/arm64
+build-tensorflow: docker-tensorflow-amd64
+docker-tensorflow: docker-tensorflow-amd64
+docker-tensorflow-amd64:
+	docker build -t photoprism/tensorflow:latest -t photoprism/tensorflow:amd64 -t photoprism/tensorflow:$(TF_VERSION)-amd64 --build-arg TF_VERSION=$(TF_VERSION) docker/tensorflow
+terminal-tensorflow: terminal-tensorflow-amd64
+terminal-tensorflow-amd64:
+	mkdir -p ./build
+	docker run --rm --pull missing -ti --platform=amd64 -v "./build:/build" -e BUILD_ARCH=amd64 -e SYSTEM_ARCH=amd64 photoprism/tensorflow:amd64 bash
+build-tensorflow-arm64: docker-tensorflow-arm64
+docker-tensorflow-arm64:
+	docker build -t photoprism/tensorflow:arm64 -t photoprism/tensorflow:$(TF_VERSION)-arm64 --build-arg TF_VERSION=$(TF_VERSION) docker/tensorflow/arm64
 terminal-tensorflow-arm64:
-	docker run --rm -ti --platform=arm64 -v "./build:/build" -e BUILD_ARCH=arm64 -e SYSTEM_ARCH=arm64 photoprism/tensorflow:arm64 bash
+	mkdir -p ./build
+	docker run --rm --pull missing -ti --platform=arm64 -v "./build:/build" -e BUILD_ARCH=arm64 -e SYSTEM_ARCH=arm64 photoprism/tensorflow:arm64 bash
 watch-js:
 	(cd frontend &&	env BUILD_ENV=development NODE_ENV=production npm run watch)
 test-js:

docker/tensorflow/Dockerfile

@@ -5,7 +5,9 @@ LABEL maintainer="PhotoPrism UG <hello@photoprism.app>"
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TMP=/tmp
 
-ENV TF_VERSION=2.18.0
+# see https://docs.docker.com/build/building/variables/#env-usage-example
+ARG TF_VERSION=2.18.0
+ENV TF_VERSION=$TF_VERSION
 
 # apt default settings
 RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \

docker/tensorflow/arm64/Dockerfile

@@ -5,7 +5,9 @@ LABEL maintainer="PhotoPrism UG <hello@photoprism.app>"
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TMP=/tmp
 
-ENV TF_VERSION=2.18.0
+# see https://docs.docker.com/build/building/variables/#env-usage-example
+ARG TF_VERSION=2.18.0
+ENV TF_VERSION=$TF_VERSION
 
 # apt default settings
 RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \

docker/tensorflow/arm64/create_archive.sh

@@ -20,7 +20,7 @@ cp tensorflow/c/*.h LICENSE tmp/include/tensorflow/c/
 cp tensorflow/core/platform/*.h tmp/include/tensorflow/core/platform
 cp third_party/xla/third_party/tsl/tsl/platform/*.h tmp/include/tsl/platform
 cp third_party/xla/xla/tsl/c/*.h tmp/include/xla/tsl/c
-(cd tmp && tar --exclude=*.params -czf ../libtensorflow-$1-$2.tar.gz .)
+(cd tmp && tar --exclude=*.params -czf /build/libtensorflow-$1-$2.tar.gz .)
 du -h libtensorflow-$1-$2.tar.gz
 
-echo "Done"
+echo "Done."

docker/tensorflow/create_archive.sh

@@ -20,7 +20,7 @@ cp tensorflow/c/*.h LICENSE tmp/include/tensorflow/c/
 cp tensorflow/core/platform/*.h tmp/include/tensorflow/core/platform
 cp third_party/xla/third_party/tsl/tsl/platform/*.h tmp/include/tsl/platform
 cp third_party/xla/xla/tsl/c/*.h tmp/include/xla/tsl/c
-(cd tmp && tar --exclude=*.params -czf ../libtensorflow-$1-$2.tar.gz .)
+(cd tmp && tar --exclude=*.params -czf /build/libtensorflow-$1-$2.tar.gz .)
 du -h libtensorflow-$1-$2.tar.gz
 
-echo "Done"
+echo "Done."

docker/tensorflow/cross/Dockerfile

@@ -1,8 +1,9 @@
 ARG BUILDER_SHA2=06040763c500bd2ebaaa4585d4729c88d2c8ccec94baa7fbe9bbe3dc2827d79d
 FROM gcr.io/tensorflow-testing/ml-devinfra-linux-aarch64-cross-compile:infrastructure-public-image-${BUILDER_SHA2}
 
-ARG TF_VERSION
-ENV TF_VERSION=${TF_VERSION}
+# see https://docs.docker.com/build/building/variables/#env-usage-example
+ARG TF_VERSION=2.18.0
+ENV TF_VERSION=$TF_VERSION
 
 COPY ./create_archive.sh .
 COPY ./Makefile Makefile

docker/tensorflow/cross/create_archive.sh

@@ -20,7 +20,7 @@ cp tensorflow/c/*.h LICENSE tmp/include/tensorflow/c/
 cp tensorflow/core/platform/*.h tmp/include/tensorflow/core/platform
 cp third_party/xla/third_party/tsl/tsl/platform/*.h tmp/include/tsl/platform
 cp third_party/xla/xla/tsl/c/*.h tmp/include/xla/tsl/c
-(cd tmp && tar --exclude=*.params -czf ../libtensorflow-$1-$2.tar.gz .)
+(cd tmp && tar --exclude=*.params -czf /build/libtensorflow-$1-$2.tar.gz .)
 du -h libtensorflow-$1-$2.tar.gz
 
-echo "Done"
+echo "Done."

docker/tensorflow/jetson-nano/create_archive.sh

@@ -20,7 +20,7 @@ cp tensorflow/c/*.h LICENSE tmp/include/tensorflow/c/
 cp tensorflow/core/platform/*.h tmp/include/tensorflow/core/platform
 cp third_party/xla/third_party/tsl/tsl/platform/*.h tmp/include/tsl/platform
 cp third_party/xla/xla/tsl/c/*.h tmp/include/xla/tsl/c
-(cd tmp && tar --exclude=*.params -czf ../libtensorflow-$1-$2.tar.gz .)
+(cd tmp && tar --exclude=*.params -czf /build/libtensorflow-$1-$2.tar.gz .)
 du -h libtensorflow-$1-$2.tar.gz
 
-echo "Done"
+echo "Done."