File tree Expand file tree Collapse file tree 4 files changed +28
-9
lines changed Expand file tree Collapse file tree 4 files changed +28
-9
lines changed Original file line number Diff line number Diff line change @@ -56,10 +56,29 @@ function get_variants() {
56
56
shift
57
57
58
58
local arch
59
- arch=$( get_arch)
59
+ local availablevariants
60
+ local variantsfilter
60
61
local variants
61
- variants=$( grep " ^$arch " " $dir /architectures" | sed -E ' s/' " $arch " ' [[:space:]]*//' | sed -E ' s/,/ /g' )
62
- echo " $variants "
62
+
63
+ arch=$( get_arch)
64
+ variantsfilter=( " $@ " )
65
+ IFS=' ' read -ra availablevariants <<< " $(grep " ^$arch " " $dir /architectures" | sed -E 's/'" $arch " '[[:space:]]*//' | sed -E 's/,/ /g')"
66
+
67
+ if [ ${# variantsfilter[@]} -gt 0 ]; then
68
+ for variant1 in " ${availablevariants[@]} " ; do
69
+ for variant2 in " ${variantsfilter[@]} " ; do
70
+ if [[ " $variant1 " = " $variant2 " ]]; then
71
+ variants+=(" $variant1 " )
72
+ fi
73
+ done
74
+ done
75
+
76
+ if [ ${# variants[@]} -gt 0 ]; then
77
+ echo " ${variants[@]} "
78
+ fi
79
+ else
80
+ echo " ${availablevariants[@]} "
81
+ fi
63
82
}
64
83
65
84
# Get supported architectures for a specific version and variant
Original file line number Diff line number Diff line change @@ -70,8 +70,8 @@ for version in "${versions[@]}"; do
70
70
71
71
# Get supported variants according to the target architecture.
72
72
# See details in function.sh
73
- variants= $( get_variants " $( dirname " $version " ) " )
74
- for variant in $ variants; do
73
+ IFS= ' ' read -ra variants <<< " $(get_variants " $( dirname " $version " ) " )"
74
+ for variant in " ${ variants[@]} " ; do
75
75
# Skip non-docker directories
76
76
[ -f " $version /$variant /Dockerfile" ] || continue
77
77
Original file line number Diff line number Diff line change @@ -53,9 +53,9 @@ for version in "${versions[@]}"; do
53
53
54
54
# Get supported variants according to the target architecture.
55
55
# See details in function.sh
56
- variants= $( get_variants " $( dirname " $version " ) " )
56
+ IFS= ' ' read -ra variants <<< " $(IFS=','; get_variants " $( dirname " $version " ) " " $2 " ) "
57
57
58
- for variant in $ variants; do
58
+ for variant in " ${ variants[@]} " ; do
59
59
# Skip non-docker directories
60
60
[ -f " $version /$variant /Dockerfile" ] || continue
61
61
Original file line number Diff line number Diff line change @@ -85,9 +85,9 @@ for version in "${versions[@]}"; do
85
85
86
86
# Get supported variants according the target architecture
87
87
# See details in function.sh
88
- variants= $( get_variants " $parentpath " )
88
+ IFS= ' ' read -ra variants <<< " $(get_variants " $parentpath " )"
89
89
90
- for variant in $ variants; do
90
+ for variant in " ${ variants[@]} " ; do
91
91
# Skip non-docker directories
92
92
[ -f " $version /$variant /Dockerfile" ] || continue
93
93
add_stage " $baseuri " " $version " " $variant "
You can’t perform that action at this time.
0 commit comments