Enhance reproducible build script with ownership resetting & docker command adjustment

Author: xxuejie

standalone-contract/scripts/reproducible_build_docker

@@ -6,7 +6,8 @@
 # to do reproducible build.
 set -ex
 
-DOCKER_IMAGE="docker.io/cryptape/llvm-n-rust:20240630"
+DOCKER="${DOCKER:-docker}"
+DOCKER_IMAGE="${DOCKER_IMAGE:-docker.io/cryptape/llvm-n-rust:20240630}"
 CHECKSUM_FILE_PATH="checksums.txt"
 
 # We are parsing command line arguments based on tips from:
@@ -23,6 +24,10 @@ while [[ $# -gt 0 ]]; do
       UPDATE="yes"
       shift # past argument
       ;;
+    -s|--sudo)
+      SUDO="yes"
+      shift # past argument
+      ;;
     --no-clean)
       NOCLEAN="yes"
       shift # past argument
@@ -53,7 +58,13 @@ else
   TASKS+=" build "
 fi
 
-docker run --rm $PROXY_ARGS -v `pwd`:/code $DOCKER_IMAGE make $TASKS
+if [[ "${SUDO}" = "yes" ]]; then
+  PREFIX="sudo"
+fi
+
+$PREFIX $DOCKER run --rm $PROXY_ARGS -v `pwd`:/code $DOCKER_IMAGE make $TASKS
+# Reset file ownerships for all files docker might touch
+sudo chown -R -f `id -u`:`id -g` checksums.txt build target
 
 if [[ "${UPDATE}" = "yes" ]]; then
   echo "${CHECKSUM_FILE_PATH} file is updated with latest binary hashes!"

workspace/scripts/reproducible_build_docker

@@ -6,7 +6,8 @@
 # to do reproducible build.
 set -ex
 
-DOCKER_IMAGE="docker.io/cryptape/llvm-n-rust:20240630"
+DOCKER="${DOCKER:-docker}"
+DOCKER_IMAGE="${DOCKER_IMAGE:-docker.io/cryptape/llvm-n-rust:20240630}"
 CHECKSUM_FILE_PATH="checksums.txt"
 
 # We are parsing command line arguments based on tips from:
@@ -23,6 +24,10 @@ while [[ $# -gt 0 ]]; do
       UPDATE="yes"
       shift # past argument
       ;;
+    -s|--sudo)
+      SUDO="yes"
+      shift # past argument
+      ;;
     --no-clean)
       NOCLEAN="yes"
       shift # past argument
@@ -53,7 +58,13 @@ else
   TASKS+=" build "
 fi
 
-docker run --rm $PROXY_ARGS -v `pwd`:/code $DOCKER_IMAGE make $TASKS
+if [[ "${SUDO}" = "yes" ]]; then
+  PREFIX="sudo"
+fi
+
+$PREFIX $DOCKER run --rm $PROXY_ARGS -v `pwd`:/code $DOCKER_IMAGE make $TASKS
+# Reset file ownerships for all files docker might touch
+sudo chown -R -f `id -u`:`id -g` checksums.txt build target
 
 if [[ "${UPDATE}" = "yes" ]]; then
   echo "${CHECKSUM_FILE_PATH} file is updated with latest binary hashes!"