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

Proposed by Barry Price
Status: Merged
Approved by: Tom Haddon
Approved revision: 6c68be8af5c037e1ed9144f18dafbc3b7961ec4a
Merged at revision: 71f7b9d39119930182207eb47d8b9a90cab0edff
Proposed branch: ~barryprice/charm-k8s-discourse/+git/charm-k8s-discourse:duplicate
Merge into: charm-k8s-discourse:master
Diff against target: 12 lines (+0/-1)
1 file modified
image/scripts/pod_setup (+0/-1)
Reviewer Review Type Date Requested Status
Tom Haddon Approve
🤖 prod-jenkaas-is (community) continuous-integration Approve
Canonical IS Reviewers Pending
Review via email: mp+412564@code.launchpad.net

Commit message

Remove extra precompile line

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

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

Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

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

Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :
review: Approve (continuous-integration)
Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM

review: Approve
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 71f7b9d39119930182207eb47d8b9a90cab0edff

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/image/scripts/pod_setup b/image/scripts/pod_setup
2index 7cb1cb7..69b7b55 100755
3--- a/image/scripts/pod_setup
4+++ b/image/scripts/pod_setup
5@@ -38,7 +38,6 @@ fi
6
7 # It is safe to build assets in the background to improve startup time.
8 export SKIP_NODE_UGLIFY="true"
9-su -s /bin/bash -c "bin/bundle exec rake assets:precompile RAILS_ENV=$RAILS_ENV" ${CONTAINER_APP_USERNAME} 2>&1 |sed 's/^/asset-build: /'
10
11 # LP#1952681: First run consistently fails to process discourse/tests/theme_qunit_helper JS
12 su -s /bin/bash -c "bin/bundle exec rake assets:precompile RAILS_ENV=$RAILS_ENV" ${CONTAINER_APP_USERNAME} 2>&1 |sed 's/^/asset-build-1: /'

Subscribers

People subscribed via source and target branches