|
@@ -20,7 +20,8 @@ join() {
|
|
|
|
|
|
|
|
commaJoin() {
|
|
commaJoin() {
|
|
|
local items=( $(xargs -n1 <<<"$1" | sort -u) ); shift
|
|
local items=( $(xargs -n1 <<<"$1" | sort -u) ); shift
|
|
|
- sep=', '
|
|
|
|
|
|
|
+
|
|
|
|
|
+ local sep=', '
|
|
|
case "${#items[@]}" in
|
|
case "${#items[@]}" in
|
|
|
0)
|
|
0)
|
|
|
return
|
|
return
|
|
@@ -100,21 +101,6 @@ if [ -n "$text" ]; then
|
|
|
default="$([ -f "$repoDir/variant.md" ] && cat "$repoDir/variant.md" || cat "$dir/variant.md")"
|
|
default="$([ -f "$repoDir/variant.md" ] && cat "$repoDir/variant.md" || cat "$dir/variant.md")"
|
|
|
default+=$'\n' # parameter expansion eats the trailing newline
|
|
default+=$'\n' # parameter expansion eats the trailing newline
|
|
|
|
|
|
|
|
- # buildpack-deps text
|
|
|
|
|
- potentialTags="$(bashbrew list --uniq "$bbRepo" | cut -d: -f2)"
|
|
|
|
|
- for tag in $potentialTags; do
|
|
|
|
|
- baseImage="$(bashbrew cat -f '{{ .ArchLastStageFrom (.TagEntry.Architectures | first) .TagEntry }}' "$bbRepo:$tag" 2>/dev/null)"
|
|
|
|
|
- case "$baseImage" in
|
|
|
|
|
- buildpack-deps:*-*) ;; # "scm", "curl" -- not large images
|
|
|
|
|
- buildpack-deps:*)
|
|
|
|
|
- default+=$'\n' # give a little space
|
|
|
|
|
- default+="$(< "$dir/variant-default-buildpack-deps.md")"
|
|
|
|
|
- default+=$'\n' # parameter expansion eats the trailing newline
|
|
|
|
|
- break
|
|
|
|
|
- ;;
|
|
|
|
|
- esac
|
|
|
|
|
- done
|
|
|
|
|
-
|
|
|
|
|
if [ "$repo" != 'debian' ] && [ "$repo" != 'ubuntu' ]; then
|
|
if [ "$repo" != 'debian' ] && [ "$repo" != 'ubuntu' ]; then
|
|
|
# what is 'jessie', 'stretch' and 'sid'
|
|
# what is 'jessie', 'stretch' and 'sid'
|
|
|
# https://github.com/docker-library/python/issues/343
|
|
# https://github.com/docker-library/python/issues/343
|
|
@@ -151,6 +137,21 @@ if [ -n "$text" ]; then
|
|
|
fi
|
|
fi
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
|
|
+ # buildpack-deps text
|
|
|
|
|
+ potentialTags="$(bashbrew list --uniq "$bbRepo" | cut -d: -f2)"
|
|
|
|
|
+ for tag in $potentialTags; do
|
|
|
|
|
+ baseImage="$(bashbrew cat -f '{{ .ArchLastStageFrom (.TagEntry.Architectures | first) .TagEntry }}' "$bbRepo:$tag" 2>/dev/null)"
|
|
|
|
|
+ case "$baseImage" in
|
|
|
|
|
+ buildpack-deps:*-*) ;; # "scm", "curl" -- not large images
|
|
|
|
|
+ buildpack-deps:*)
|
|
|
|
|
+ default+=$'\n' # give a little space
|
|
|
|
|
+ default+="$(< "$dir/variant-default-buildpack-deps.md")"
|
|
|
|
|
+ default+=$'\n' # parameter expansion eats the trailing newline
|
|
|
|
|
+ break
|
|
|
|
|
+ ;;
|
|
|
|
|
+ esac
|
|
|
|
|
+ done
|
|
|
|
|
+
|
|
|
echo
|
|
echo
|
|
|
echo
|
|
echo
|
|
|
|
|
|