@@ -6,15 +6,6 @@ declare -A aliases=(
6
6
[8.1]=' 8 latest'
7
7
)
8
8
9
- defaultDebianSuite=' bullseye'
10
- declare -A debianSuites=(
11
- # [7.4]='buster'
12
- )
13
- defaultAlpineVersion=' 3.16'
14
- declare -A alpineVersions=(
15
- # [8.1]='3.16'
16
- )
17
-
18
9
self=" $( basename " $BASH_SOURCE " ) "
19
10
cd " $( dirname " $( readlink -f " $BASH_SOURCE " ) " ) "
20
11
@@ -105,6 +96,28 @@ for version; do
105
96
${aliases[$version]:- }
106
97
)
107
98
99
+ defaultDebianVariant=" $( jq -r '
100
+ .[env.version].variants
101
+ | map(
102
+ split("/")[0]
103
+ | select(
104
+ startswith("alpine")
105
+ | not
106
+ )
107
+ )
108
+ | .[0]
109
+ ' versions.json) "
110
+ defaultAlpineVariant=" $( jq -r '
111
+ .[env.version].variants
112
+ | map(
113
+ split("/")[0]
114
+ | select(
115
+ startswith("alpine")
116
+ )
117
+ )
118
+ | .[0]
119
+ ' versions.json) "
120
+
108
121
for dir in " ${variants[@]} " ; do
109
122
suite=" $( dirname " $dir " ) " # "buster", etc
110
123
variant=" $( basename " $dir " ) " # "cli", etc
@@ -119,9 +132,9 @@ for version; do
119
132
fi
120
133
121
134
suiteVariantAliases=( " ${variantAliases[@]/%/ -$suite } " )
122
- if [ " ${ suite# alpine} " = " ${alpineVersions[$version] :- $defaultAlpineVersion } " ] ; then
135
+ if [ " $suite " = " $defaultAlpineVariant " ] ; then
123
136
variantAliases=( " ${variantAliases[@]/%/ -alpine} " )
124
- elif [ " $suite " != " ${debianSuites[$version] :- $defaultDebianSuite } " ]; then
137
+ elif [ " $suite " != " $defaultDebianVariant " ]; then
125
138
variantAliases=()
126
139
fi
127
140
variantAliases=( " ${suiteVariantAliases[@]} " ${variantAliases[@]+" ${variantAliases[@]} " } )
0 commit comments