Bump base image for OpenSSL CVEs

[discourse_docker.git] / launcher

diff --git a/launcher b/launcher
index 70e27513a35908f92cef8ed404ccb5898f5d463c..d5a6e4c3c2b13c6d78fae7b0eb3cb77f48d5fd76 100755 (executable)
--- a/launcher
+++ b/launcher
@@ -90,7 +90,7 @@ git_rec_version='1.8.0'
 config_file=containers/"$config".yml
 cidbootstrap=cids/"$config"_bootstrap.cid
 local_discourse=local_discourse
-image="discourse/base:2.0.20201207-2236"
+image="discourse/base:2.0.20210217-2235"
 docker_path=`which docker.io 2> /dev/null || which docker`
 git_path=`which git`
 
@@ -244,8 +244,8 @@ check_prereqs() {
       echo
       if [[ $REPLY =~ ^[Yy]$ ]]
       then
-        $docker_path container prune --force --filter until=1h >/dev/null
-        $docker_path image prune --all --force --filter until=1h >/dev/null
+        $docker_path container prune --force --filter until=24h >/dev/null
+        $docker_path image prune --all --force --filter until=24h >/dev/null
         echo "If the cleanup was successful, you may try again now"
       fi
     fi
@@ -258,37 +258,6 @@ if [ -z "$SKIP_PREREQS" ] && [ "$command" != "cleanup" ]; then
   check_prereqs
 fi
 
-host_run() {
-  read -r -d '' env_ruby << 'RUBY'
-  require 'yaml'
-
-  input = STDIN.readlines.join
-  yaml = YAML.load(input)
-
-  if host_run = yaml['host_run']
-    params = yaml['params'] || {}
-    host_run.each do |run|
-      params.each do |k,v|
-        run = run.gsub("$#{k}", v)
-      end
-      STDOUT.write "#{run}--SEP--"
-    end
-  end
-RUBY
-
-  host_run=`cat $config_file | $docker_path run $user_args --rm -i -a stdout -a stdin $image ruby -e "$env_ruby"`
-
-  while [ "$host_run" ] ; do
-    iter=${host_run%%--SEP--*}
-    echo
-    echo "Host run: $iter"
-    $iter || exit 1
-    echo
-    host_run="${host_run#*--SEP--}"
-  done
-}
-
-
 set_volumes() {
   volumes=`cat $config_file | $docker_path run $user_args --rm -i -a stdout -a stdin $image ruby -e \
         "require 'yaml'; puts YAML.load(STDIN.readlines.join)['volumes'].map{|v| '-v ' << v['volume']['host'] << ':' << v['volume']['guest'] << ' '}.join"`
@@ -594,8 +563,6 @@ run_start() {
      fi
    fi
 
-   host_run
-
    set_template_info
    set_volumes
    set_links
@@ -663,8 +630,6 @@ run_run() {
 }
 
 run_bootstrap() {
-  host_run
-
   # 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