diff --git a/docker/tensorflow/Dockerfile b/docker/tensorflow/Dockerfile index 4b4f851e6..3c59a31da 100644 --- a/docker/tensorflow/Dockerfile +++ b/docker/tensorflow/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:24.10 +FROM ubuntu:22.04 LABEL maintainer="PhotoPrism UG " @@ -21,15 +21,18 @@ RUN apt-get update && apt-get upgrade && \ build-essential \ python3 \ ca-certificates \ - llvm-17 \ - clang-17 \ curl \ wget \ git \ + lsb-release \ + software-properties-common \ + gnupg \ jq # Install bazelisk -RUN ln -s /usr/bin/python3 /usr/bin/python && \ +RUN wget https://apt.llvm.org/llvm.sh && chmod u+x llvm.sh && \ + ./llvm.sh 17 && rm llvm.sh && \ + ln -s /usr/bin/python3 /usr/bin/python && \ ln -s /usr/bin/clang-17 /usr/bin/clang && \ ln -s /usr/bin/clang++-17 /usr/bin/clang++ && \ ln -s /usr/bin/clang-cpp /usr/bin/clang-cpp && \ diff --git a/docker/tensorflow/arm64/create_archive.sh b/docker/tensorflow/arm64/create_archive.sh index ae1a53f3c..6f534d89a 100755 --- a/docker/tensorflow/arm64/create_archive.sh +++ b/docker/tensorflow/arm64/create_archive.sh @@ -14,13 +14,13 @@ mkdir -p tmp/include/tensorflow/core/platform mkdir -p tmp/include/tsl/platform mkdir -p tmp/include/xla/tsl/c -cp bazel-bin/tensorflow/libtensorflow* tmp/lib/ +cp -av bazel-bin/tensorflow/libtensorflow* tmp/lib/ cp tensorflow/c/eager/*.h tmp/include/tensorflow/c/eager/ 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 -czf ../libtensorflow-$1-$2.tar.gz .) +(cd tmp && tar --exclude=*.params -czf ../libtensorflow-$1-$2.tar.gz .) du -h libtensorflow-$1-$2.tar.gz echo "Done" diff --git a/docker/tensorflow/create_archive.sh b/docker/tensorflow/create_archive.sh index ae1a53f3c..6f534d89a 100755 --- a/docker/tensorflow/create_archive.sh +++ b/docker/tensorflow/create_archive.sh @@ -14,13 +14,13 @@ mkdir -p tmp/include/tensorflow/core/platform mkdir -p tmp/include/tsl/platform mkdir -p tmp/include/xla/tsl/c -cp bazel-bin/tensorflow/libtensorflow* tmp/lib/ +cp -av bazel-bin/tensorflow/libtensorflow* tmp/lib/ cp tensorflow/c/eager/*.h tmp/include/tensorflow/c/eager/ 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 -czf ../libtensorflow-$1-$2.tar.gz .) +(cd tmp && tar --exclude=*.params -czf ../libtensorflow-$1-$2.tar.gz .) du -h libtensorflow-$1-$2.tar.gz echo "Done" diff --git a/docker/tensorflow/cross/create_archive.sh b/docker/tensorflow/cross/create_archive.sh index ae1a53f3c..6f534d89a 100755 --- a/docker/tensorflow/cross/create_archive.sh +++ b/docker/tensorflow/cross/create_archive.sh @@ -14,13 +14,13 @@ mkdir -p tmp/include/tensorflow/core/platform mkdir -p tmp/include/tsl/platform mkdir -p tmp/include/xla/tsl/c -cp bazel-bin/tensorflow/libtensorflow* tmp/lib/ +cp -av bazel-bin/tensorflow/libtensorflow* tmp/lib/ cp tensorflow/c/eager/*.h tmp/include/tensorflow/c/eager/ 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 -czf ../libtensorflow-$1-$2.tar.gz .) +(cd tmp && tar --exclude=*.params -czf ../libtensorflow-$1-$2.tar.gz .) du -h libtensorflow-$1-$2.tar.gz echo "Done" diff --git a/docker/tensorflow/jetson-nano/create_archive.sh b/docker/tensorflow/jetson-nano/create_archive.sh index ae1a53f3c..6f534d89a 100755 --- a/docker/tensorflow/jetson-nano/create_archive.sh +++ b/docker/tensorflow/jetson-nano/create_archive.sh @@ -14,13 +14,13 @@ mkdir -p tmp/include/tensorflow/core/platform mkdir -p tmp/include/tsl/platform mkdir -p tmp/include/xla/tsl/c -cp bazel-bin/tensorflow/libtensorflow* tmp/lib/ +cp -av bazel-bin/tensorflow/libtensorflow* tmp/lib/ cp tensorflow/c/eager/*.h tmp/include/tensorflow/c/eager/ 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 -czf ../libtensorflow-$1-$2.tar.gz .) +(cd tmp && tar --exclude=*.params -czf ../libtensorflow-$1-$2.tar.gz .) du -h libtensorflow-$1-$2.tar.gz echo "Done"