added a configurable format for "DockerExec do ps" command

Sengorius · Sengorius · commit 59fb137b1a90 · 2022-05-18T19:16:34.000+02:00
diff --git a/.env.template b/.env.template
@@ -23,3 +23,9 @@ export ATTACH_TO_COMPOSE_LOGS=1
 
 # the name of the local Docker network for this proxy-stack
 export NETWORK_NAME=proxy-network
+
+# tell "DockerExec do ps" what columns to print out; separate with a pipe
+# possible values are: ID, Image, Command, CreatedAt, RunningFor, Ports,
+# State, Status, Size, Names, Labels, Mounts and Networks
+# see https://docs.docker.com/engine/reference/commandline/ps/#formatting
+export DOCKER_PS_COLUMNS="Image|Status|Ports|Names"
diff --git a/DockerExec b/DockerExec
@@ -518,7 +518,12 @@ elif [[ "do" == "$ENVIRONMENT" ]]; then
 
     # shortcut to list all docker containers
     elif [[ "ps" == "$ACTION" ]]; then
-        docker ps -a --format "table {{.Image}}\t{{.Status}}\t{{.Ports}}\t{{.Names}}"
+        PS_COLUMNS=${DOCKER_PS_COLUMNS:-Image|Status|Ports|Names}
+        PS_COLUMNS=${PS_COLUMNS//|/ }
+        PS_COLUMNS_FORMATTED=$(join_by '}}\t{{.' $PS_COLUMNS)
+        PS_FORMAT="table {{.$PS_COLUMNS_FORMATTED}}"
+
+        docker ps -a --format "$PS_FORMAT"
 
     else
         print_error "Unknown option '$ACTION'..." 1
diff --git a/src/helpers.sh b/src/helpers.sh
@@ -187,3 +187,14 @@ function import_to_database_container() {
     docker exec -it "$CONTAINER_NAME" bash -c "$COMMAND" && \
     print_info "Import complete." 1
 }
+
+# joins an input by given glue on first parameter
+# usage: join_by ', ' a b c d
+function join_by() {
+  local d=${1-}
+  local f=${2-}
+
+  if shift 2; then
+    printf %s "$f" "${@/#/$d}"
+  fi
+}
