Docker: refactor the exe function

Author: inetic

docker/build-linux.sh

@@ -59,7 +59,7 @@ dock run -d --rm --name $container_name $image_name \
     sh -c 'sleep 60; while [ -n "$(find /tmp/alive -cmin -10)" ]; do sleep 10; done'
 
 # Prevent the container from stopping
-while true; do exe / touch /tmp/alive || true; sleep 14; done &
+while true; do exe touch /tmp/alive || true; sleep 14; done &
 keep_alive_pid=$!
 
 # Enter the container on exit
@@ -75,7 +75,7 @@ function on_exit() {
 # Set up secrets inside the container
 if [ "$flavor" != unofficial ]; then
     function exe_i() { dock exec -i $container_name "$@"; }
-    exe / mkdir -p /opt/secrets
+    exe mkdir -p /opt/secrets
     echo "$secretKeystoreHex" | xxd -p -r      | exe_i dd of=/opt/secrets/keystore.jks
     echo "storePassword=$secretStorePassword"  | exe_i dd of=/opt/secrets/key.properties
     echo "keyPassword=$secretKeyPassword"      | exe_i dd of=/opt/secrets/key.properties oflag=append conv=notrunc
@@ -94,12 +94,12 @@ else
 fi
 
 # Generate bindings (TODO: This should be done automatically)
-exe /opt/ouisync-app/ouisync/bindings/dart dart pub get
-exe /opt/ouisync-app/ouisync/bindings/dart dart tool/bindgen.dart
+exe -d /opt/ouisync-app/ouisync/bindings/dart dart pub get
+exe -d /opt/ouisync-app/ouisync/bindings/dart dart tool/bindgen.dart
 
 # Build Ouisync app
-exe /opt/ouisync-app dart pub get
-exe /opt/ouisync-app dart run util/release.dart \
+exe -d /opt/ouisync-app dart pub get
+exe -d /opt/ouisync-app dart run util/release.dart \
     --flavor=$flavor \
     $arg_android_key_properties \
     $arg_sentry \
@@ -108,6 +108,6 @@ exe /opt/ouisync-app dart run util/release.dart \
 # Collect artifacts
 mkdir -p $dst_dir
 src_dir=/opt/ouisync-app/releases/latest
-for artifact in $(exe $src_dir ls); do
+for artifact in $(exe -d $src_dir ls); do
     dock cp $container_name:$src_dir/$artifact $dst_dir/
 done

docker/build-utils.sh

@@ -14,10 +14,25 @@ function dock() {
     docker --host ssh://$host "$@"
 }
 
-function exe() {
-    local dir=$1; shift
-    dock exec -w $dir $container_name "$@"
-}
+function exe() (
+    while [[ "$#" -gt 0 ]]; do
+        case $1 in
+            -d) local dir_opt="-w $2"; shift ;;
+            -i) local interactive_opt="-i" ;;
+            -l) local history_log=1 ;;
+            *) break ;;
+        esac
+        shift
+    done
+
+    local cmd="dock exec $dir_opt $interactive_opt $container_name $@"
+
+    if [ "$history_log" == 1 ]; then
+        echo $cmd | dock exec -i $container_name dd of=/root/.bash_history oflag=append conv=notrunc
+    fi
+
+    $cmd
+)
 
 function get_sources_from_git {
     local commit=$1
@@ -26,9 +41,9 @@ function get_sources_from_git {
     # Remove slash suffix if present
     dstdir=${dstdir%/}
 
-    exe $dstdir/ git clone --filter=tree:0 https://github.com/equalitie/ouisync-app
-    exe $dstdir/ouisync-app git reset --hard $commit
-    exe $dstdir/ouisync-app git submodule update --init --recursive
+    exe -d $dstdir/ git clone --filter=tree:0 https://github.com/equalitie/ouisync-app
+    exe -d $dstdir/ouisync-app git reset --hard $commit
+    exe -d $dstdir/ouisync-app git submodule update --init --recursive
 }
 
 function get_sources_from_local_dir {
@@ -54,5 +69,5 @@ function get_sources_from_local_dir {
         ${exclude_dirs[@]/#/--exclude=} \
         ${srcdir%/}/ $container_name:$dstdir/ouisync-app
 
-    exe / git config --global --add safe.directory /opt/ouisync-app
+    exe git config --global --add safe.directory /opt/ouisync-app
 }

docker/build-windows.sh

@@ -62,7 +62,7 @@ dock run -d --rm --name $container_name --cpus $host_core_count -p 22 $image_nam
     sh -c 'sleep 60; while [ -n "$(find /tmp/alive -cmin -10)" ]; do sleep 10; done'
 
 # Prevent the container from stopping
-while true; do exe / touch /tmp/alive || true; sleep 14; done &
+while true; do exe touch /tmp/alive || true; sleep 14; done &
 keep_alive_pid=$!
 
 # Enter the container on exit
@@ -77,8 +77,8 @@ function on_exit() {
 
 # Prepare secrets
 if [ "$flavor" = "production" ]; then
-    exe / mkdir c:\\secrets
-    exe / powershell -Command "Add-Content -Force -Path c:/secrets/sentry_dsn -Value \"$secretSentryDSN\""
+    exe mkdir c:\\secrets
+    exe powershell -Command "Add-Content -Force -Path c:/secrets/sentry_dsn -Value \"$secretSentryDSN\""
     sentry_arg='--sentry=C:/secrets/sentry_dsn'
 fi
 
@@ -90,18 +90,18 @@ else
 fi
 
 # Generate bindings
-exe c:/ouisync-app/ouisync/bindings/dart dart pub get
-exe c:/ouisync-app/ouisync/bindings/dart dart tool/bindgen.dart
+exe -d c:/ouisync-app/ouisync/bindings/dart dart pub get
+exe -d c:/ouisync-app/ouisync/bindings/dart dart tool/bindgen.dart
 
 # Build Ouisync
-exe c:/ouisync-app dart pub get
-exe c:/ouisync-app dart run util/release.dart --flavor=$flavor $sentry_arg $build_exe $build_msix
+exe -d c:/ouisync-app dart pub get
+exe -d c:/ouisync-app dart run util/release.dart --flavor=$flavor $sentry_arg $build_exe $build_msix
 
 function dock_rsync() {
     rsync -e "docker -H ssh://$host exec -i" "$@"
 }
 
 mkdir -p $out_dir
-for asset in $(exe c:/ouisync-app/releases/latest ls); do
+for asset in $(exe -d c:/ouisync-app/releases/latest ls); do
     dock_rsync -av $container_name:/c/ouisync-app/releases/latest/$asset $out_dir
 done