Skip to content

Commit beac75e

Browse files
committed
Added distribution versions to generated tags.
Refs #649
1 parent 1bacdf4 commit beac75e

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

generate-stackbrew-library.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,13 @@ for version in "${versions[@]}"; do
6060
fi
6161
versionAliases+=( ${aliases[$version]:-} )
6262

63+
debianVersion="$(git show "$commit":"$version/$base/Dockerfile" | awk -F"[-:]" '$1 == "FROM debian" { print $2; exit }')"
64+
debianAliases=( ${versionAliases[@]/%/-$debianVersion} )
65+
debianAliases=( "${debianAliases[@]//latest-/}" )
66+
6367
echo
6468
cat <<-EOE
65-
Tags: $(join ', ' "${versionAliases[@]}")
69+
Tags: $(join ', ' "${versionAliases[@]}"), $(join ', ' "${debianAliases[@]}")
6670
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
6771
GitCommit: $commit
6872
Directory: $version/$base
@@ -72,6 +76,7 @@ for version in "${versions[@]}"; do
7276
commit="$(dirCommit "$version/$variant")"
7377

7478
variantAliases=( "${versionAliases[@]/%/-perl}" )
79+
variantAliases+=( "${versionAliases[@]/%/-${variant/debian/$debianVersion}}" )
7580
variantAliases=( "${variantAliases[@]//latest-/}" )
7681

7782
echo
@@ -83,10 +88,13 @@ for version in "${versions[@]}"; do
8388
EOE
8489
done
8590

91+
alpineVersion="$(git show "$commit":"$version/alpine-slim/Dockerfile" | awk -F: '$1 == "FROM alpine" { print $2; exit }')"
92+
8693
for variant in alpine alpine-perl; do
8794
commit="$(dirCommit "$version/$variant")"
8895

8996
variantAliases=( "${versionAliases[@]/%/-$variant}" )
97+
variantAliases+=( "${versionAliases[@]/%/-${variant/alpine/alpine$alpineVersion}}" )
9098
variantAliases=( "${variantAliases[@]//latest-/}" )
9199

92100
echo
@@ -102,6 +110,7 @@ for version in "${versions[@]}"; do
102110
commit="$(dirCommit "$version/$variant")"
103111

104112
variantAliases=( "${versionAliases[@]/%/-$variant}" )
113+
variantAliases+=( "${versionAliases[@]/%/-${variant/alpine/alpine$alpineVersion}}" )
105114
variantAliases=( "${variantAliases[@]//latest-/}" )
106115

107116
echo

0 commit comments

Comments
 (0)