Skip to content
Snippets Groups Projects
Commit beac75ef authored by Konstantin Pavlov's avatar Konstantin Pavlov Committed by Konstantin Pavlov
Browse files

Added distribution versions to generated tags.

parent 1bacdf48
No related branches found
No related tags found
No related merge requests found
...@@ -60,9 +60,13 @@ for version in "${versions[@]}"; do ...@@ -60,9 +60,13 @@ for version in "${versions[@]}"; do
fi fi
versionAliases+=( ${aliases[$version]:-} ) versionAliases+=( ${aliases[$version]:-} )
debianVersion="$(git show "$commit":"$version/$base/Dockerfile" | awk -F"[-:]" '$1 == "FROM debian" { print $2; exit }')"
debianAliases=( ${versionAliases[@]/%/-$debianVersion} )
debianAliases=( "${debianAliases[@]//latest-/}" )
echo echo
cat <<-EOE cat <<-EOE
Tags: $(join ', ' "${versionAliases[@]}") Tags: $(join ', ' "${versionAliases[@]}"), $(join ', ' "${debianAliases[@]}")
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: $commit GitCommit: $commit
Directory: $version/$base Directory: $version/$base
...@@ -72,6 +76,7 @@ for version in "${versions[@]}"; do ...@@ -72,6 +76,7 @@ for version in "${versions[@]}"; do
commit="$(dirCommit "$version/$variant")" commit="$(dirCommit "$version/$variant")"
variantAliases=( "${versionAliases[@]/%/-perl}" ) variantAliases=( "${versionAliases[@]/%/-perl}" )
variantAliases+=( "${versionAliases[@]/%/-${variant/debian/$debianVersion}}" )
variantAliases=( "${variantAliases[@]//latest-/}" ) variantAliases=( "${variantAliases[@]//latest-/}" )
echo echo
...@@ -83,10 +88,13 @@ for version in "${versions[@]}"; do ...@@ -83,10 +88,13 @@ for version in "${versions[@]}"; do
EOE EOE
done done
alpineVersion="$(git show "$commit":"$version/alpine-slim/Dockerfile" | awk -F: '$1 == "FROM alpine" { print $2; exit }')"
for variant in alpine alpine-perl; do for variant in alpine alpine-perl; do
commit="$(dirCommit "$version/$variant")" commit="$(dirCommit "$version/$variant")"
variantAliases=( "${versionAliases[@]/%/-$variant}" ) variantAliases=( "${versionAliases[@]/%/-$variant}" )
variantAliases+=( "${versionAliases[@]/%/-${variant/alpine/alpine$alpineVersion}}" )
variantAliases=( "${variantAliases[@]//latest-/}" ) variantAliases=( "${variantAliases[@]//latest-/}" )
echo echo
...@@ -102,6 +110,7 @@ for version in "${versions[@]}"; do ...@@ -102,6 +110,7 @@ for version in "${versions[@]}"; do
commit="$(dirCommit "$version/$variant")" commit="$(dirCommit "$version/$variant")"
variantAliases=( "${versionAliases[@]/%/-$variant}" ) variantAliases=( "${versionAliases[@]/%/-$variant}" )
variantAliases+=( "${versionAliases[@]/%/-${variant/alpine/alpine$alpineVersion}}" )
variantAliases=( "${variantAliases[@]//latest-/}" ) variantAliases=( "${variantAliases[@]//latest-/}" )
echo echo
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment