|
@ -87,7 +87,12 @@ if [[ $opt_squash -eq 1 ]]; then |
|
|
buildopts="$buildopts --squash-all" |
|
|
buildopts="$buildopts --squash-all" |
|
|
fi |
|
|
fi |
|
|
if [[ $opt_redo -eq 1 ]]; then |
|
|
if [[ $opt_redo -eq 1 ]]; then |
|
|
buildopts="$buildopts --no-cache --pull" |
|
|
buildopts="$buildopts --no-cache" |
|
|
|
|
|
|
|
|
|
|
|
registry=$(grep -m 1 "^FROM " Containerfile | sed -E 's/FROM ([a-zA-Z0-9.]*)(\/.*)?/\1/') |
|
|
|
|
|
if [[ "$registry" != 'localhost' ]]; then |
|
|
|
|
|
buildopts="$buildopts --pull" |
|
|
|
|
|
fi |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
# tell buildah to build images in docker format instead of the default OCI format |
|
|
# tell buildah to build images in docker format instead of the default OCI format |
|
|