@@ -25,15 +25,15 @@ cd "$repo_top" || {
2525}
2626
2727base_dir=$( basename " $( pwd) " )
28- : " ${ALPINE_VERSION := 3.20 } "
28+ : " ${DEBIAN_VERSION := bookworm } "
2929: " ${BUILD_CONTEXT:= $(pwd)} "
3030: " ${IMAGE_NAME:= $base_dir } "
3131: " ${LICENSE:= MIT} "
3232: " ${REGISTRY:= ghcr.io} "
33- : " ${RUBY_VERSION:= 3.3.4 } "
33+ : " ${RUBY_VERSION:= 3.3.6 } "
3434: " ${REGISTRY_TOKEN:= $GITHUB_TOKEN } "
3535
36- base_image_tag=" $RUBY_VERSION -alpine $ALPINE_VERSION "
36+ base_image_tag=" $RUBY_VERSION -$DEBIAN_VERSION "
3737base_exists=$( skopeo list-tags docker://docker.io/ruby | jq -r " any(.Tags[] == \" $base_image_tag \" ; .)" )
3838if [ " $base_exists " = " false" ]
3939then
209209service=$( basename " $owner_and_repo " .git)
210210owner=$( dirname " $owner_and_repo " )
211211
212- full_tag=$IMAGE_NAME :$tag -ruby$RUBY_VERSION -alpine $ALPINE_VERSION
212+ full_tag=$IMAGE_NAME :$tag -ruby$RUBY_VERSION -$DEBIAN_VERSION
213213# Pass any extra arguments to the build command ("$@" contains the rest of the arguments)
214214$runtime build --tag " $full_tag " " $@ " \
215215 --label org.opencontainers.image.created=" $( date --utc --iso-8601=seconds) " \
@@ -221,7 +221,7 @@ $runtime build --tag "$full_tag" "$@" \
221221 --label org.opencontainers.image.source=" Generated by ruby-automation's build_image.sh ($USER @$HOSTNAME )" \
222222 --label org.opencontainers.image.version=" $full_tag " \
223223 --label shortref=" $shortref " \
224- --build-arg ALPINE_VERSION =" $ALPINE_VERSION " \
224+ --build-arg DEBIAN_VERSION =" $DEBIAN_VERSION " \
225225 --build-arg RUBY_VERSION=" $RUBY_VERSION " \
226226 -f " $containerfile " " $BUILD_CONTEXT " || die 8 " Failed to build image"
227227
237237mapfile -t tags < <( echo " $tag " | awk -F' .' ' NF==3{print; print $1"."$2; print $1; next} NF==2{print; print $1; next} {print}' )
238238for t in " ${tags[@]} "
239239do
240- new_tag=$IMAGE_NAME :$t -ruby$RUBY_VERSION -alpine $ALPINE_VERSION
240+ new_tag=$IMAGE_NAME :$t -ruby$RUBY_VERSION -$DEBIAN_VERSION
241241 registry_image_name=" $REGISTRY /$owner /$new_tag "
242242 if [ " $runtime " = " podman" ]
243243 then
0 commit comments