diff options
Diffstat (limited to 'make_ami.sh')
-rwxr-xr-x | make_ami.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/make_ami.sh b/make_ami.sh index 9b24227..45d8ab3 100755 --- a/make_ami.sh +++ b/make_ami.sh | |||
@@ -132,7 +132,7 @@ install_core_packages() { | |||
132 | # | 132 | # |
133 | chroot "$target" apk --no-cache add \ | 133 | chroot "$target" apk --no-cache add \ |
134 | linux-virt@edge-main \ | 134 | linux-virt@edge-main \ |
135 | aws-ena-driver@edge-testing \ | 135 | aws-ena-driver@edge-community \ |
136 | alpine-mirrors \ | 136 | alpine-mirrors \ |
137 | chrony \ | 137 | chrony \ |
138 | openssh \ | 138 | openssh \ |
@@ -282,10 +282,16 @@ cleanup() { | |||
282 | umount "$target" | 282 | umount "$target" |
283 | } | 283 | } |
284 | 284 | ||
285 | version_sorted() { | ||
286 | # falsey if $1 version > $2 version | ||
287 | printf "%s\n%s" $1 $2 | sort -VC | ||
288 | } | ||
289 | |||
285 | main() { | 290 | main() { |
286 | [ "$#" -ne 2 ] && { echo "usage: $0 '<repo>[,<repo>]' '<pkg>[,<pkg>]'"; exit 1; } | 291 | [ "$#" -ne 2 ] && die "Expecting two parameters\nUsage: $0 '<repo>[,<repo>]' '<pkg>[,<pkg>]'" |
287 | [ "$ALPINE_RELEASE" != 'edge' ] && [[ "$ALPINE_RELEASE" -lt "$MIN_RELEASE" ]] && \ | 292 | [ "$ALPINE_RELEASE" != 'edge' ] && { |
288 | { echo "ERR: minimum alpine_release value must be '$MIN_RELEASE'"; exit 1; } | 293 | version_sorted $MIN_RELEASE $ALPINE_RELEASE || die "Minimum alpine_release is '$MIN_RELEASE'" |
294 | } | ||
289 | 295 | ||
290 | local add_repos="$1" | 296 | local add_repos="$1" |
291 | local add_pkgs="$2" | 297 | local add_pkgs="$2" |