Skip to content

Commit 595f204

Browse files
committed
allow passthrough of --format to ls|ps commands
1 parent f522534 commit 595f204

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

image.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ main_image(){
33
local list=()
44
local quiet=false
55
local all=false
6+
local format
67

78
[ $# -eq 0 ] && die/help 1
8-
set -- $(args/normalize_flags_first "" "$@")
9+
set -- $(args/normalize "" "$@")
910
while [ $# -ne 0 ]; do
1011
case "$1" in
1112
-h|--help)
@@ -14,6 +15,8 @@ main_image(){
1415
all=true ;;
1516
-f|--force)
1617
__force=true ;;
18+
--format)
19+
format="$2" ; shift ;;
1720
-p|--pull)
1821
__pull=true ;;
1922
-q|--quiet)
@@ -131,6 +134,7 @@ dex/image-ls(){
131134
[ -n "$image" ] && flags+=( "--filter=label=org.dockerland.dex.image=$image" )
132135
[ -n "$repo" ] && flags+=( "--filter=label=org.dockerland.dex.repo=$repo" )
133136
[ -n "$tag" ] && flags+=( "--filter=label=org.dockerland.dex.tag=$tag" )
137+
[ -n "$format" ] && flags+=( "--format $format" )
134138
$quiet && flags+=( "-q" )
135139

136140
docker/local images ${flags[@]}

ps.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ main_ps(){
33
local list=()
44
local global=false
55
local quiet=false
6+
local format
67

78
set -- $(args/normalize_flags_first "" "$@")
89
while [ $# -ne 0 ]; do
@@ -11,6 +12,8 @@ main_ps(){
1112
die/help ;;
1213
-a|--all)
1314
global=true ;;
15+
--format)
16+
format="$2" ; shift ;;
1417
-q|--quiet)
1518
quiet=true ;;
1619
--)
@@ -50,6 +53,7 @@ dex/ps(){
5053
[ -n "$image" ] && flags+=( "--filter=label=org.dockerland.dex.image=$image" )
5154
[ -n "$repo" ] && flags+=( "--filter=label=org.dockerland.dex.repo=$repo" )
5255
[ -n "$tag" ] && flags+=( "--filter=label=org.dockerland.dex.tag=$tag" )
56+
[ -n "$format" ] && flags+=( "--format $format" )
5357
$quiet && flags+=( "-q" )
5458

5559
docker/local ps -a ${flags[@]}

0 commit comments

Comments
 (0)