Skip to content

Commit 165ede9

Browse files
committed
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.
1 parent 1e1571e commit 165ede9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

launcher

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -648,10 +648,6 @@ run_run() {
648648
}
649649

650650
run_bootstrap() {
651-
# Is the image available?
652-
# If not, pull it here so the user is aware what's happening.
653-
$docker_path history $image >/dev/null 2>&1 || pull_image
654-
655651
set_template_info
656652

657653
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() {
664660
image=$base_image
665661
fi
666662

663+
# the base_image may not always be discourse/base,
664+
# let's ensure we always build from the latest
665+
pull_image
666+
667667
set_volumes
668668
set_links
669669

0 commit comments

Comments
 (0)