Merge ~barryprice/charm-k8s-discourse/+git/charm-k8s-discourse:master into charm-k8s-discourse:master

[Barry Price]

Loop the precompile stage to work around LP:1952681

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

PASSED: Continuous integration, rev:5b0d839de7a37471e889f1b7e384b2eeb377ee57
https://jenkins.canonical.com/is/job/lp-charm-k8s-discourse-ci/41/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/159/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/588133/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-discourse-ci/41//rebuild

review: Approve (continuous-integration)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

ce8a938... by Barry Price on 2021-11-30

Clarify output, skip the sed step to avoid mucking around with PIPESTATUS

[Barry Price (barryprice)]

Not sure why, but bundle doesn't seem to be exiting cleanly even on a successful run - so marking this Rejected and adopting a dumber but safer approach:

https://code.launchpad.net/~barryprice/charm-k8s-discourse/+git/charm-k8s-discourse/+merge/412557

review: Needs Fixing

Unmerged commits

ce8a938... by Barry Price on 2021-11-30

Clarify output, skip the sed step to avoid mucking around with PIPESTATUS

5b0d839... by Barry Price on 2021-11-30

Loop the precompile stage to work around LP:1952681

diff --git a/image/scripts/pod_setup b/image/scripts/pod_setup
index d716174..ca1c036 100755
--- a/image/scripts/pod_setup
+++ b/image/scripts/pod_setup
@@ -38,4 +38,12 @@ fi
 
 # It is safe to build assets in the background to improve startup time.
 export SKIP_NODE_UGLIFY="true"
-su -s /bin/bash -c "bin/bundle exec rake assets:precompile RAILS_ENV=$RAILS_ENV" ${CONTAINER_APP_USERNAME} 2>&1 |sed 's/^/asset-build: /'
+## LP#1952681: Some files fail minification - the process does leave us with usable assets, but aborts - so we need to retry
+success=0
+attempt=1
+while [[ "$success" -eq 0 ]];
+do
+	echo "Running assets:precompile, attempt #${attempt}";
+	su -s /bin/bash -c "bin/bundle exec rake assets:precompile RAILS_ENV=$RAILS_ENV" ${CONTAINER_APP_USERNAME} 2>&1 && success=1;
+	((attempt++))
+done