Fixed docker build script

emgucv · Sep 10, 2024 · 1ed603c · 1ed603c
1 parent 6535d60
commit 1ed603c
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 22 deletions.
diff --git a/platforms/ubuntu/docker/docker_build_emgutf b/platforms/ubuntu/docker/docker_build_emgutf
@@ -4,13 +4,19 @@ cd "$(dirname "$0")"
 
 cd ../../..
 
+USER_ID=$(id -u)
+USER_NAME=$(whoami)
+
+echo "USER_ID=$USER_ID"
+echo "USER_NAME=$USER_NAME"
+
 docker run \
-  -e USER="$(id -u)" \
-  -u="$(id -u)" \
+  -e USER="$USER_ID" \
+  -u="$USER_ID" \
   -v $(pwd):/src/workspace \
   -v /etc/passwd:/etc/passwd \
-  -w /src/workspace/platforms/ubuntu/22.04 \
-  emgu/bazel-android:dotnet-6.0-bazel-5.0.0-ubuntu-22.04 \
+  -w /src/workspace/platforms/ubuntu/24.04 \
+  emgu/bazel-android:ubuntu-24.04-dotnet-8-bazelisk \
   ./build_emgutf
 
 
diff --git a/platforms/ubuntu/docker/docker_build_tf b/platforms/ubuntu/docker/docker_build_tf
@@ -1,17 +1,27 @@
-#!/bin/bash
+#!/bin/bash -v
 
 cd "$(dirname "$0")"
 
 mkdir -p /tmp/build_output
 
 cd ../../..
 
+USER_ID=$(id -u)
+USER_NAME=$(whoami)
+
+echo "USER_ID=$USER_ID"
+echo "USER_NAME=$USER_NAME"
+
 docker run \
-  -e USER="$(id -u)" \
-  -u="$(id -u)" \
+  -e USER="$USER_ID" \
+  -u="$USER_ID" \
   -v $(pwd):/src/workspace \
+  -v /home/$USER_NAME/.cache/bazelisk:/home/$USER_NAME/.cache/bazelisk \
   -v /tmp/build_output:/tmp/build_output \
   -v /etc/passwd:/etc/passwd \
-  -w /src/workspace/platforms/ubuntu/22.04 \
-  emgu/bazel-android:dotnet-6.0-bazel-5.0.0-ubuntu-22.04 \
-  ./bazel_build_tf 
+  -w /src/workspace/platforms/ubuntu/24.04 \
+  emgu/bazel-android:ubuntu-24.04-dotnet-8-bazelisk \
+  bash -c "./bazel_build_tf" 
+
+
+
diff --git a/platforms/ubuntu/docker/docker_build_tf_android b/platforms/ubuntu/docker/docker_build_tf_android
@@ -13,13 +13,20 @@ mkdir -p /tmp/build_output
 
 cd ../../..
 
+USER_ID=$(id -u)
+USER_NAME=$(whoami)
+
+echo "USER_ID=$USER_ID"
+echo "USER_NAME=$USER_NAME"
+
 docker run \
-  -e USER="$(id -u)" \
-  -u="$(id -u)" \
+  -e USER="$USER_ID" \
+  -u="$USER_ID" \
   -v $(pwd):/src/workspace \
+  -v /home/$USER_NAME/.cache/bazelisk:/home/$USER_NAME/.cache/bazelisk \
   -v /tmp/build_output:/tmp/build_output \
   -v /etc/passwd:/etc/passwd \
   -w /src/workspace/platforms/android \
-  emgu/bazel-android:dotnet-6.0-bazel-5.0.0-ubuntu-22.04 \
+  emgu/bazel-android:ubuntu-24.04-dotnet-8-bazelisk \
   ./build_tf_android $1
 
diff --git a/platforms/ubuntu/docker/docker_build_tflite b/platforms/ubuntu/docker/docker_build_tflite
@@ -1,19 +1,26 @@
-#!/bin/bash
+#!/bin/bash -v
 
 cd "$(dirname "$0")"
 
 mkdir -p /tmp/build_output
 
 cd ../../..
 
+USER_ID=$(id -u)
+USER_NAME=$(whoami)
+
+echo "USER_ID=$USER_ID"
+echo "USER_NAME=$USER_NAME"
+
 docker run \
-  -e USER="$(id -u)" \
-  -u="$(id -u)" \
+  -e USER="$USER_ID" \
+  -u="$USER_ID" \
   -v $(pwd):/src/workspace \
+  -v /home/$USER_NAME/.cache/bazelisk:/home/$USER_NAME/.cache/bazelisk \
   -v /tmp/build_output:/tmp/build_output \
   -v /etc/passwd:/etc/passwd \
-  -w /src/workspace/platforms/ubuntu/22.04 \
-  emgu/bazel-android:dotnet-6.0-bazel-5.0.0-ubuntu-22.04 \
-  ./bazel_build_tflite
+  -w /src/workspace/platforms/ubuntu/24.04 \
+  emgu/bazel-android:ubuntu-24.04-dotnet-8-bazelisk \
+  bash -c "./bazel_build_tflite"
 
 
diff --git a/platforms/ubuntu/docker/docker_build_tflite_android b/platforms/ubuntu/docker/docker_build_tflite_android
@@ -13,13 +13,20 @@ mkdir -p /tmp/build_output
 
 cd ../../..
 
+USER_ID=$(id -u)
+USER_NAME=$(whoami)
+
+echo "USER_ID=$USER_ID"
+echo "USER_NAME=$USER_NAME"
+
 docker run \
-  -e USER="$(id -u)" \
-  -u="$(id -u)" \
+  -e USER="$USER_ID" \
+  -u="$USER_ID" \
   -v $(pwd):/src/workspace \
+  -v /home/$USER_NAME/.cache/bazelisk:/home/$USER_NAME/.cache/bazelisk \
   -v /tmp/build_output:/tmp/build_output \
   -v /etc/passwd:/etc/passwd \
   -w /src/workspace/platforms/android/ \
-  emgu/bazel-android:dotnet-6.0-bazel-5.0.0-ubuntu-22.04 \
+  emgu/bazel-android:ubuntu-24.04-dotnet-8-bazelisk \
   ./build_tflite_android $1