From: Michael Brown <supermathie@gmail.com>
Date: Tue, 3 May 2022 00:41:07 +0000 (-0400)
Subject: FIX: ensure the latest image is always pulled for the container we're building
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=165ede971918d4b917ea2073e5117c30eae80fd3;p=discourse_docker.git

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.
---

diff --git a/launcher b/launcher
index 59d358a..a6177e9 100755
--- a/launcher
+++ b/launcher
@@ -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