FIX: ensure the latest image is always pulled for the container we're building

If the user has overridden the `base_image` to something other than default, we
may not get the latest version of that image when bootstrapping.

To remedy, always pull the image to check the manifest after we parse it out.
This commit is contained in:
Michael Brown 2022-05-02 20:41:07 -04:00 committed by Michael Brown
parent 1e1571e370
commit 165ede9719
1 changed files with 4 additions and 4 deletions

View File

@ -648,10 +648,6 @@ run_run() {
}
run_bootstrap() {
# Is the image available?
# If not, pull it here so the user is aware what's happening.
$docker_path history $image >/dev/null 2>&1 || pull_image
set_template_info
base_image=`cat $config_file | $docker_path run $user_args --rm -i -a stdin -a stdout $image ruby -e \
@ -664,6 +660,10 @@ run_bootstrap() {
image=$base_image
fi
# the base_image may not always be discourse/base,
# let's ensure we always build from the latest
pull_image
set_volumes
set_links