+ cp-into-docker-run: add -p option

Author: oldratlee

README.md

@@ -56,6 +56,8 @@ source <(curl -fsSL https://raw.githubusercontent.com/oldratlee/useful-scripts/r
     不重排序输入完成整个输入行的去重。相比系统的`uniq`命令加强的是可以跨行去重，不需要排序输入。
 1. [ap and rp](docs/shell.md#-ap-and-rp)  
     批量转换文件路径为绝对路径/相对路径，会自动跟踪链接并规范化路径。
+1. [cp-into-docker-run](docs/shell.md#-cp-into-docker-run)  
+    一个`Docker`使用的便利脚本。拷贝本机的执行文件到指定的`docker container`中并在`docker container`中执行。
 1. [tcp-connection-state-counter](docs/shell.md#-tcp-connection-state-counter)  
     统计各个`TCP`连接状态的个数。用于方便排查系统连接负荷问题。
 1. [xpl and xpf](docs/shell.md#-xpl-and-xpf)  

bin/cp-into-docker-run

@@ -49,10 +49,13 @@ docker options:
   -c, --container    destination docker container
   -u, --docker-user  docker username or UID to run command
                      optional, docker default is (maybe) root user
-  -w, --workdir      working directory inside the container
+  -w, --workdir      absolute working directory inside the container
                      optional, docker default is (maybe) root dir
   -t, --tmpdir       tmp dir in docker to copy command
                      optional, default is /tmp
+  -p, --cp-path      destination path in docker of the command(including file name)
+                     if specified, command will be kept when run finished
+                     optional, default is under tmp dir and deleted when run finished
 
 run options:
   -v, --verbose      show operation step infos
@@ -78,6 +81,7 @@ container_name=
 docker_user=
 docker_workdir=
 docker_tmpdir=/tmp
+docker_command_cp_path=
 verbose=false
 declare -a args=()
 
@@ -99,6 +103,10 @@ while (($# > 0)); do
         docker_tmpdir="$2"
         shift 2
         ;;
+    -p | --cp-path)
+        docker_command_cp_path="$2"
+        shift 2
+        ;;
     -v | --verbose)
         verbose=true
         shift
@@ -125,6 +133,11 @@ while (($# > 0)); do
     esac
 done
 
+if [ -n "${docker_command_cp_path:-}" ]; then
+    [[ "$docker_command_cp_path" =~ ^/ ]] ||
+        die "the command path in docker to copy must be absolute path: $docker_command_cp_path"
+fi
+
 ################################################################################
 # biz logic
 ################################################################################
@@ -148,17 +161,25 @@ if [ ! -f "$specified_run_command" ]; then
     run_command="$(which "$specified_run_command")"
 fi
 run_command="$($READLINK_CMD -f "$run_command")"
+run_command_base_name="$(basename "$run_command")"
 
-run_timestamp="$(date "+%Y%m%d_%H%M%S")"
-readonly uuid="${PROG}_${run_timestamp}_${$}_${RANDOM}"
+if [ -n "${docker_command_cp_path:-}" ]; then
+    run_command_dir_in_docker="$(dirname "$docker_command_cp_path")"
+    readonly run_command_in_docker="$docker_command_cp_path"
+else
+    run_timestamp="$(date "+%Y%m%d_%H%M%S")"
+    readonly uuid="${PROG}_${run_timestamp}_${$}_${RANDOM}"
+    readonly work_tmp_dir_in_docker="$docker_tmpdir/$uuid"
 
-run_command_base_name="$(basename "$run_command")"
-readonly run_command_dir_in_docker="$docker_tmpdir/$uuid"
-readonly run_command_in_docker="$run_command_dir_in_docker/$run_command_base_name"
+    readonly run_command_dir_in_docker="$work_tmp_dir_in_docker"
+    readonly run_command_in_docker="$run_command_dir_in_docker/$run_command_base_name"
+fi
 
 cleanupWhenExit() {
+    [ -n "${work_tmp_dir_in_docker:-}" ] || return 0
+
     # remove tmp dir in docker by root user
-    docker exec "${container_name}" rm -rf -- "$run_command_dir_in_docker" &>/dev/null
+    docker exec "${container_name}" rm -rf -- "$work_tmp_dir_in_docker" &>/dev/null
 }
 trap "cleanupWhenExit" EXIT
 

docs/shell.md

@@ -391,10 +391,13 @@ docker options:
   -c, --container    destination docker container
   -u, --docker-user  docker username or UID to run command
                      optional, docker default is (maybe) root user
-  -w, --workdir      working directory inside the container
+  -w, --workdir      absolute working directory inside the container
                      optional, docker default is (maybe) root dir
   -t, --tmpdir       tmp dir in docker to copy command
                      optional, default is /tmp
+  -p, --cp-path      destination path in docker of the command(including file name)
+                     if specified, command will be kept when run finished
+                     optional, default is under tmp dir and deleted when run finished
 
 run options:
   -v, --verbose      show operation step infos
@@ -432,7 +435,7 @@ SYN_SENT      7
 
 ### 贡献者
 
-[sunuslee](https://github.com/sunuslee)改进此脚本，增加对`MacOS`的支持。 [#56](https://github.com/oldratlee/useful-scripts/pull/56)
+[sunuslee](https://github.com/sunuslee) 改进此脚本，增加对`MacOS`的支持。 [#56](https://github.com/oldratlee/useful-scripts/pull/56)
 
 🍺 [xpl](../bin/xpl) and [xpf](../bin/xpf)
 ----------------------
@@ -536,7 +539,7 @@ colorEchoWithoutNewLine "4;33;40" "Hello world!" "Hello Hell!"
 
 ### 贡献者
 
-[姜太公](https://github.com/jzwlqx)提供循环输出彩色组合的脚本。
+[姜太公](https://github.com/jzwlqx) 提供循环输出彩色组合的脚本。
 
 ### 参考资料